Do this everywhere, also fixup CLEANFILES

Do this everywhere, also fixup CLEANFILES

2001-04-14  Michael Meeks  <michael@ximian.com>

	* Makefile.am (dist-hook): remove built sources from dist.

svn path=/trunk/; revision=9309

12 files changed, 27908 insertions, 18484 deletions

diff --git a/po/az.po b/po/az.po
index f7da457bda..5338a3b5e5 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-03-21 22:20+0100\n"
+"POT-Creation-Date: 2001-04-14 08:51-0400\n"
 "PO-Revision-Date: 2000-03-17 10:53+0200\n"
 "Last-Translator: Vasif Ismailoglu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkish\n"
@@ -13,11 +13,11 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3255
+#: addressbook/backend/ebook/e-card.c:3209
 msgid "Card: "
 msgstr "Kart: "
 
-#: addressbook/backend/ebook/e-card.c:3257
+#: addressbook/backend/ebook/e-card.c:3211
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +25,7 @@ msgstr ""
 "\n"
 "Ad: "
 
-#: addressbook/backend/ebook/e-card.c:3258
+#: addressbook/backend/ebook/e-card.c:3212
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +33,7 @@ msgstr ""
 "\n"
 "  Prefiks:\t"
 
-#: addressbook/backend/ebook/e-card.c:3259
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +41,7 @@ msgstr ""
 "\n"
 "  Verilən:\t"
 
-#: addressbook/backend/ebook/e-card.c:3260
+#: addressbook/backend/ebook/e-card.c:3214
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +49,7 @@ msgstr ""
 "\n"
 "  Əlavə: "
 
-#: addressbook/backend/ebook/e-card.c:3261
+#: addressbook/backend/ebook/e-card.c:3215
 msgid ""
 "\n"
 "  Family:     "
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "  Ailə:\t"
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "  Suffiks:\t"
 
-#: addressbook/backend/ebook/e-card.c:3276
+#: addressbook/backend/ebook/e-card.c:3230
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +73,7 @@ msgstr ""
 "\n"
 "Ad günü:  "
 
-#: addressbook/backend/ebook/e-card.c:3287
+#: addressbook/backend/ebook/e-card.c:3241
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +81,7 @@ msgstr ""
 "\n"
 "Ünvan:"
 
-#: addressbook/backend/ebook/e-card.c:3289
+#: addressbook/backend/ebook/e-card.c:3243
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,7 +89,7 @@ msgstr ""
 "\n"
 "   Poçt Qutusu:\t"
 
-#: addressbook/backend/ebook/e-card.c:3290
+#: addressbook/backend/ebook/e-card.c:3244
 msgid ""
 "\n"
 "  Ext:         "
@@ -97,7 +97,7 @@ msgstr ""
 "\n"
 "   Əlavə:\t"
 
-#: addressbook/backend/ebook/e-card.c:3291
+#: addressbook/backend/ebook/e-card.c:3245
 msgid ""
 "\n"
 "  Street:      "
@@ -105,7 +105,7 @@ msgstr ""
 "\n"
 "   Küçə:\t"
 
-#: addressbook/backend/ebook/e-card.c:3292
+#: addressbook/backend/ebook/e-card.c:3246
 msgid ""
 "\n"
 "  City:        "
@@ -113,7 +113,7 @@ msgstr ""
 "\n"
 "   Şəhər:\t"
 
-#: addressbook/backend/ebook/e-card.c:3293
+#: addressbook/backend/ebook/e-card.c:3247
 msgid ""
 "\n"
 "  Region:      "
@@ -121,7 +121,7 @@ msgstr ""
 "\n"
 "   Rayon:\t"
 
-#: addressbook/backend/ebook/e-card.c:3294
+#: addressbook/backend/ebook/e-card.c:3248
 msgid ""
 "\n"
 "  Postal Code: "
@@ -129,7 +129,7 @@ msgstr ""
 "\n"
 "   Poçt Kodu:\t"
 
-#: addressbook/backend/ebook/e-card.c:3295
+#: addressbook/backend/ebook/e-card.c:3249
 msgid ""
 "\n"
 "  Country:     "
@@ -137,7 +137,7 @@ msgstr ""
 "\n"
 "   Ölkə:\t"
 
-#: addressbook/backend/ebook/e-card.c:3308
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "Delivery Label: "
@@ -145,7 +145,7 @@ msgstr ""
 "\n"
 "Təslim Etiketi:  "
 
-#: addressbook/backend/ebook/e-card.c:3320
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +153,7 @@ msgstr ""
 "\n"
 "Telefonlar:\n"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3277
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +161,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3347
+#: addressbook/backend/ebook/e-card.c:3301
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +169,7 @@ msgstr ""
 "\n"
 "ePoçt:\n"
 
-#: addressbook/backend/ebook/e-card.c:3350
+#: addressbook/backend/ebook/e-card.c:3304
 msgid ""
 "\n"
 "E-mail:"
@@ -177,7 +177,7 @@ msgstr ""
 "\n"
 "ePoçt:"
 
-#: addressbook/backend/ebook/e-card.c:3369
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Mailer: "
@@ -185,7 +185,7 @@ msgstr ""
 "\n"
 "Göndərici:  "
 
-#: addressbook/backend/ebook/e-card.c:3375
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "Time Zone: "
@@ -193,7 +193,7 @@ msgstr ""
 "\n"
 "Zaman zolağı:  "
 
-#: addressbook/backend/ebook/e-card.c:3383
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Geo Location: "
@@ -201,7 +201,7 @@ msgstr ""
 "\n"
 "Coğrafi Yerləşmə:  "
 
-#: addressbook/backend/ebook/e-card.c:3387
+#: addressbook/backend/ebook/e-card.c:3341
 msgid ""
 "\n"
 "Business Role: "
@@ -209,7 +209,7 @@ msgstr ""
 "\n"
 "Məslək:\t"
 
-#: addressbook/backend/ebook/e-card.c:3399
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "Org: "
@@ -217,7 +217,7 @@ msgstr ""
 "\n"
 "Quruluş:\t"
 
-#: addressbook/backend/ebook/e-card.c:3400
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Name:  "
@@ -225,7 +225,7 @@ msgstr ""
 "\n"
 "   Ad:\t"
 
-#: addressbook/backend/ebook/e-card.c:3401
+#: addressbook/backend/ebook/e-card.c:3355
 msgid ""
 "\n"
 "  Unit:  "
@@ -233,7 +233,7 @@ msgstr ""
 "\n"
 "   Bölmə:\t"
 
-#: addressbook/backend/ebook/e-card.c:3402
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "  Unit2: "
@@ -241,7 +241,7 @@ msgstr ""
 "\n"
 "   Bölmə2:\t"
 
-#: addressbook/backend/ebook/e-card.c:3403
+#: addressbook/backend/ebook/e-card.c:3357
 msgid ""
 "\n"
 "  Unit3: "
@@ -249,7 +249,7 @@ msgstr ""
 "\n"
 "   Bölmə3:\t"
 
-#: addressbook/backend/ebook/e-card.c:3404
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Unit4: "
@@ -257,7 +257,7 @@ msgstr ""
 "\n"
 "   Bölmə4:\t"
 
-#: addressbook/backend/ebook/e-card.c:3408
+#: addressbook/backend/ebook/e-card.c:3362
 msgid ""
 "\n"
 "Categories: "
@@ -265,7 +265,7 @@ msgstr ""
 "\n"
 "Kateqoriyalar:\t"
 
-#: addressbook/backend/ebook/e-card.c:3409
+#: addressbook/backend/ebook/e-card.c:3363
 msgid ""
 "\n"
 "Comment: "
@@ -283,7 +283,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3376
 msgid ""
 "\n"
 "Unique String: "
@@ -291,7 +291,7 @@ msgstr ""
 "\n"
 "Yeganə Kəlimə:\t"
 
-#: addressbook/backend/ebook/e-card.c:3425
+#: addressbook/backend/ebook/e-card.c:3379
 msgid ""
 "\n"
 "Public Key: "
@@ -301,22 +301,21 @@ 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."
+msgstr "'GnomeCard' fayllarını 'Evolution' içinə gətirən e'malatxana."
 
 #: 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/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
+#: 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:68 calendar/gui/main.c:54
+#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
 msgid "Could not initialize Bonobo"
 msgstr "Bonoboyu başlada bilmədim"
 
@@ -328,20 +327,20 @@ msgstr "Ox yüklənə bilmədi\n"
 msgid "EBook not loaded\n"
 msgstr "eKitab yüklənmədi\n"
 
-#: addressbook/conduit/address-conduit.c:651
+#: addressbook/conduit/address-conduit.c:654
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Wombat xidməti başladıla bilmədi"
 
-#: addressbook/conduit/address-conduit.c:652
+#: addressbook/conduit/address-conduit.c:655
 #: calendar/conduits/calendar/calendar-conduit.c:732
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Wombatı başlada bilmədim"
 
-#: 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 "Pilot Ünvan əlavələri bloku oxuna bilmədi"
 
@@ -349,7 +348,7 @@ msgstr "Pilot Ünvan əlavələri bloku oxuna bilmədi"
 #: 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
+#: mail/mail-config.glade.h:7
 msgid "Add"
 msgstr "Əlavə Et"
 
@@ -390,7 +389,6 @@ msgstr "Fərqli fayllalə:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:10
 #: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
 msgid "General"
 msgstr "Ümumi"
 
@@ -407,7 +405,7 @@ msgid "Phone Types"
 msgstr "Telefon Növləri"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "Primary Email"
 msgstr "İlk ePoçt ünvanı"
 
@@ -420,7 +418,7 @@ msgid "Web page address:"
 msgstr "Web səhifəsi :"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:74
 msgid "_Add"
 msgstr "_Əlavə Et"
 
@@ -445,8 +443,8 @@ msgid "_Company:"
 msgstr "Ş_irkət :"
 
 #: 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
+#: 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"
 msgstr "_Sil"
 
@@ -498,126 +496,122 @@ msgstr "_Bu ePoçt ünvanıdır"
 msgid "Delete Contact?"
 msgstr "Əlaqəni Silimmi?"
 
-#: addressbook/contact-editor/e-contact-editor.c:590
+#: addressbook/contact-editor/e-contact-editor.c:603
 msgid "This contact belongs to these categories:"
 msgstr "Bu üzv bu kateqoriyalara aitdir:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
-#: addressbook/gui/widgets/e-addressbook-view.c:628
+#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/widgets/e-addressbook-view.c:676
 msgid "Assistant"
 msgstr "Köməkçi"
 
-#: 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/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1310
 msgid "Business"
 msgstr "Məslək"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#: addressbook/gui/widgets/e-addressbook-view.c:615
+#: addressbook/contact-editor/e-contact-editor.c:1244
 msgid "Business 2"
 msgstr "2.nci Məslək"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#: addressbook/gui/widgets/e-addressbook-view.c:613
+#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Business Fax"
 msgstr "Məsləki Faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Callback"
 msgstr "Geri axtarma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#: addressbook/gui/widgets/e-addressbook-view.c:612
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "Car"
 msgstr "Maşın"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1248
 msgid "Company"
 msgstr "Şirkət"
 
-#: 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/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1311
 msgid "Home"
 msgstr "Ev"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
-#: addressbook/gui/widgets/e-addressbook-view.c:616
+#: addressbook/contact-editor/e-contact-editor.c:1250
 msgid "Home 2"
 msgstr "2.nci ev"
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
-#: addressbook/gui/widgets/e-addressbook-view.c:614
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Home Fax"
 msgstr "Ev faksı"
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
-#: addressbook/gui/widgets/e-addressbook-view.c:617
+#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
-#: addressbook/gui/widgets/e-addressbook-view.c:611
+#: addressbook/contact-editor/e-contact-editor.c:1253
 msgid "Mobile"
 msgstr "Cib telefonu"
 
-#: 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/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"
 msgstr "Başqa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:662
 msgid "Other Fax"
 msgstr "Başqa faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/gui/widgets/e-addressbook-view.c:619
+#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Pager"
 msgstr "Peycer"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:607
+#: addressbook/contact-editor/e-contact-editor.c:1257
 msgid "Primary"
 msgstr "İlk"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/gui/widgets/e-addressbook-view.c:664
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/widgets/e-addressbook-view.c:665
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:1260
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
-#: addressbook/gui/widgets/e-addressbook-view.c:620
+#: 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:1273
-#: addressbook/gui/widgets/e-addressbook-view.c:621
+#: 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-quick-add.c:215
+#: addressbook/contact-editor/e-contact-quick-add.c:223
 msgid "Contact Quick-Add"
 msgstr "Cəld Əlaqə Əlavəsi"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:217
+#: addressbook/contact-editor/e-contact-quick-add.c:225
 msgid "Edit Full"
 msgstr "Hamısını Düzəlt"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:254
+#: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/widgets/e-addressbook-view.c:643
 msgid "Full Name"
 msgstr "Tam Ad"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:260
+#: addressbook/contact-editor/e-contact-quick-add.c:268
 msgid "E-mail"
 msgstr "ePoçt"
 
@@ -733,25 +727,25 @@ msgstr "_Suffiks:"
 msgid "_Title:"
 msgstr "B_aşlıq:"
 
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:241
 msgid "As _Minicards"
 msgstr "_Balaca kartlar olaraq"
 
-#: addressbook/gui/component/addressbook.c:243
+#: 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:413
+#: addressbook/gui/component/addressbook.c:399
 #, c-format
 msgid "Enter password for %s"
 msgstr "%s üçün parol girin"
 
-#: addressbook/gui/component/addressbook.c:441
+#: addressbook/gui/component/addressbook.c:427
 msgid "Unable to open addressbook"
 msgstr "Ünvan dəftərini aça bilmədim"
 
-#: addressbook/gui/component/addressbook.c:446
+#: 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"
@@ -771,149 +765,149 @@ msgstr ""
 "qurub, Evolution'u yenidən yoxlayıb yenidən qurmaq "
 "məcburiyyətindəsən.\n"
 
-#: addressbook/gui/component/addressbook.c:569
+#: addressbook/gui/component/addressbook.c:555
 msgid "Show All"
 msgstr "Hamısını Göstər"
 
-#: addressbook/gui/component/addressbook.c:571
+#: addressbook/gui/component/addressbook.c:557
 msgid "Advanced..."
 msgstr "Ətraflı..."
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:587
 msgid "Any field contains"
 msgstr "Daxil edən hər hansı üzv"
 
-#: addressbook/gui/component/addressbook.c:602
+#: addressbook/gui/component/addressbook.c:588
 msgid "Name contains"
 msgstr "Ad daxil edən"
 
-#: addressbook/gui/component/addressbook.c:603
+#: addressbook/gui/component/addressbook.c:589
 msgid "Email contains"
 msgstr "ePoçt daxil edən"
 
-#: addressbook/gui/component/addressbook.c:746
+#: addressbook/gui/component/addressbook.c:732
 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-storage.c:95
+#: addressbook/gui/component/addressbook-storage.c:99
 msgid "Other Contacts"
 msgstr "Digər Əlaqələr"
 
-#: addressbook/gui/component/addressbook-config.c:143
+#: addressbook/gui/component/addressbook-config.c:148
 msgid "LDAP Server"
 msgstr "LDAP Vericisi"
 
-#: addressbook/gui/component/addressbook-config.c:145
+#: addressbook/gui/component/addressbook-config.c:150
 msgid "File"
 msgstr "Fayl"
 
-#: addressbook/gui/component/addressbook-config.c:148
+#: addressbook/gui/component/addressbook-config.c:153
 msgid "Unknown addressbook type"
 msgstr "Namə'lum ünvan dəftəri"
 
-#: addressbook/gui/component/addressbook-config.c:158
+#: addressbook/gui/component/addressbook-config.c:163
 msgid "None (anonymous mode)"
 msgstr "Heç biri (adsız halı)"
 
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:305
+#: 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-store.c:145
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
 msgid "Password"
 msgstr "Parol"
 
-#: addressbook/gui/component/addressbook-config.c:162
+#: addressbook/gui/component/addressbook-config.c:167
 msgid "SASL"
 msgstr "SASL"
 
-#: addressbook/gui/component/addressbook-config.c:165
+#: addressbook/gui/component/addressbook-config.c:170
 msgid "Unknown auth type"
 msgstr "Namə'lum tanıtma növü"
 
-#: addressbook/gui/component/addressbook-config.c:174
+#: addressbook/gui/component/addressbook-config.c:179
 msgid "Base"
 msgstr "Əsas"
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "One"
 msgstr "Bir"
 
-#: addressbook/gui/component/addressbook-config.c:178
+#: addressbook/gui/component/addressbook-config.c:183
 msgid "Subtree"
 msgstr "Alt Ağac"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: 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:348
+#: addressbook/gui/component/addressbook-config.c:353
 msgid "Bind DN:"
 msgstr "Cild DN:"
 
-#: addressbook/gui/component/addressbook-config.c:349
+#: 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:351
+#: 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:401
-#: mail/mail-config.glade.h:30
+#: addressbook/gui/component/addressbook-config.c:406
+#: mail/mail-config.glade.h:28
 msgid "Host:"
 msgstr "Ev Sahibi:"
 
-#: addressbook/gui/component/addressbook-config.c:402
+#: 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:404
+#: addressbook/gui/component/addressbook-config.c:409
 msgid "Port:"
 msgstr "Qapı:"
 
-#: addressbook/gui/component/addressbook-config.c:405
+#: addressbook/gui/component/addressbook-config.c:410
 msgid "FIXME Port help text here."
 msgstr "FIXME Qapı kömək mətni burda."
 
-#: addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/component/addressbook-config.c:414
 msgid "Root DN:"
 msgstr "Kök DN :"
 
-#: addressbook/gui/component/addressbook-config.c:410
+#: 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/component/addressbook-config.c:430
+#: addressbook/gui/component/addressbook-config.c:435
 msgid "Search Scope:"
 msgstr "Axtarış Hərəkəti ..."
 
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
+#: addressbook/gui/component/addressbook-config.c:489
 msgid "Authentication:"
 msgstr "Tanıtma :"
 
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:51
+#: addressbook/gui/component/addressbook-config.c:507
+#: mail/mail-config.glade.h:44
 msgid "Path:"
 msgstr "Yol:"
 
-#: addressbook/gui/component/addressbook-config.c:503
+#: 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/component/addressbook-config.c:508
+#: addressbook/gui/component/addressbook-config.c:513
 msgid "Create path if it doesn't exist."
 msgstr "Belə bir yol yoxdursa yarat."
 
-#: addressbook/gui/component/addressbook-config.c:642
+#: addressbook/gui/component/addressbook-config.c:647
 msgid "Edit Addressbook"
 msgstr "Ünvan dəftərini düzəlt"
 
-#: addressbook/gui/component/addressbook-config.c:644
+#: addressbook/gui/component/addressbook-config.c:649
 msgid "Add Addressbook"
 msgstr "Ünvan dəftəri əlavə et"
 
-#: addressbook/gui/component/addressbook-config.c:660
+#: addressbook/gui/component/addressbook-config.c:665
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
@@ -921,22 +915,22 @@ 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:666
-#: mail/mail-config.glade.h:43
+#: addressbook/gui/component/addressbook-config.c:671
+#: mail/mail-config.glade.h:35
 msgid "Name:"
 msgstr "Ad :"
 
-#: addressbook/gui/component/addressbook-config.c:667
+#: 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:669
+#: 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:670
+#: addressbook/gui/component/addressbook-config.c:675
 msgid "FIXME Description help text here"
 msgstr "FIXME İzah kömək mətbi burda."
 
@@ -945,12 +939,14 @@ 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/folder-browser.c:574
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
+#: 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:6 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Sil"
 
@@ -961,7 +957,6 @@ msgid "Edit"
 msgstr "Düzəlt"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Name"
 msgstr "Ad"
 
@@ -969,58 +964,68 @@ msgstr "Ad"
 msgid "URI"
 msgstr "URI"
 
-#: addressbook/gui/component/e-address-widget.c:366
+#: addressbook/gui/component/e-address-widget.c:365
 #, fuzzy
 msgid "Disable Queries"
 msgstr "Mövcud Kateqoriyalar :"
 
-#: addressbook/gui/component/e-address-widget.c:366
+#: addressbook/gui/component/e-address-widget.c:365
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:389
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+#: 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:425
-#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#: 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 displaying an address."
+#, fuzzy
+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:3
+#: 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:4
+#: 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:5
+#: 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:6
+#: 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:7
+#: 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:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the Addressbook's address popup"
+msgstr "Ünvan Dəftəriidə ünvan göstərici"
+
+#: 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:9
+#: 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ı"
 
@@ -1032,13 +1037,14 @@ msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü e'malatxanası"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c: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
+#: 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 "Sil"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#: addressbook/gui/component/select-names/e-select-names-popup.c:146
 msgid "Remove All"
 msgstr "Hamısını Sil"
 
@@ -1058,7 +1064,7 @@ msgstr "Ad Seç"
 msgid "Select name from:"
 msgstr "Adı buradan seç:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
 msgid "Search"
 msgstr "Axtar"
 
@@ -1170,72 +1176,175 @@ 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-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
 msgid "Save as VCard"
 msgstr "VCard olaraq qeyd et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-minicard.c:669
+#, fuzzy
+msgid "Send contact to other"
+msgstr "Əlaqəni fərqli yerə gö_ndər..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-minicard.c:670
+#, fuzzy
+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/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
+msgid "Print"
+msgstr "Çap Et"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-minicard.c:672
+#, fuzzy
+msgid "Print Envelope"
+msgstr "_Zərfi Çap Et..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:641
 msgid "* Click here to add a contact *"
 msgstr "* Əlaqə əlavə etmək üçün buraya tıqlayın *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:606
+#: addressbook/gui/widgets/e-addressbook-view.c:642
+#, fuzzy
+msgid "File As"
+msgstr "Fərqli fayllalə:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:644
 msgid "Email"
 msgstr "ePoçt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:610
+#: addressbook/gui/widgets/e-addressbook-view.c:645
+#, fuzzy
+msgid "Primary Phone"
+msgstr "İlk"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:646
+#, fuzzy
+msgid "Assistant Phone"
+msgstr "Köməkçi"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:647
+#, fuzzy
+msgid "Business Phone"
+msgstr "2.nci Məslək"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:648
+#, fuzzy
+msgid "Callback Phone"
+msgstr "Geri axtarma"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:649
+#, fuzzy
+msgid "Company Phone"
+msgstr "Şirkət"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:650
+#, fuzzy
+msgid "Home Phone"
+msgstr "2.nci ev"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:651
 msgid "Organization"
 msgstr "Şirkət"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:622
+#: addressbook/gui/widgets/e-addressbook-view.c:652
+#, fuzzy
+msgid "Business Address"
+msgstr "2.nci Məslək"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:653
+#, fuzzy
+msgid "Home Address"
+msgstr "Ünvanı Yoxla"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:654
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "Cib telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:658
+#, fuzzy
+msgid "Business Phone 2"
+msgstr "2.nci Məslək"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:659
+#, fuzzy
+msgid "Home Phone 2"
+msgstr "2.nci ev"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:661
+#, fuzzy
+msgid "Other Phone"
+msgstr "Digər Əlaqələr"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:666
+#, fuzzy
+msgid "TTY"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:667
+#, fuzzy
+msgid "Other Address"
+msgstr "Ünvanı Yoxla"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:670
 msgid "Web Site"
 msgstr "Web Səhifəsi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:623
+#: addressbook/gui/widgets/e-addressbook-view.c:671
 msgid "Department"
 msgstr "Bölmə"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:672
 msgid "Office"
 msgstr "İdarə"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:625
+#: addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Title"
 msgstr "Başlıq"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:626
+#: addressbook/gui/widgets/e-addressbook-view.c:674
 msgid "Profession"
 msgstr "Məslək"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:627
+#: addressbook/gui/widgets/e-addressbook-view.c:675
 msgid "Manager"
 msgstr "İdarəci"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:629
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 msgid "Nickname"
 msgstr "Ləqəb"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:630
+#: addressbook/gui/widgets/e-addressbook-view.c:678
 msgid "Spouse"
 msgstr "Yoldaş"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:631
+#: addressbook/gui/widgets/e-addressbook-view.c:679
 msgid "Note"
 msgstr "Qeyd"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:632
+#: addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Free-busy URL"
 msgstr "Sərbəst/məşğul URL"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:633
-msgid "Click here to add a contact"
-msgstr "Əlaqəni əlavə etmək üçün tıqlayın>"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-minicard-control.c:282
 msgid "Save in addressbook"
 msgstr "Ünvan dəftərinə qeyd et"
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:166
 msgid ""
 "\n"
 "\n"
@@ -1249,7 +1358,7 @@ msgstr ""
 "\n"
 "Buraya cüt-tıqlayaraq bir əlaqə üzvünü yarat."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Kart Nümayişi "
 
@@ -1433,126 +1542,127 @@ msgstr "Pilot Təqvim əlavələri bloku oxuna bilmədi"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot Ediləcəklər əlavələri bloku oxuna bilmədi"
 
-#: calendar/gui/calendar-commands.c:258
+#: calendar/gui/calendar-commands.c:266
 msgid "File not found"
 msgstr "Fayl tapıla bilmədi"
 
-#: calendar/gui/calendar-commands.c:282
+#: calendar/gui/calendar-commands.c:290
 msgid "Open calendar"
 msgstr "Təqvimi aç"
 
-#: calendar/gui/calendar-commands.c:324
+#: calendar/gui/calendar-commands.c:332
 msgid "Save calendar"
 msgstr "Təqvimi qeyd et"
 
-#: calendar/gui/calendar-commands.c:478
+#: calendar/gui/calendar-commands.c:468
 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:366 calendar/gui/calendar-model.c:901
-#: calendar/gui/e-calendar-table.c:329
+#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
+#: calendar/gui/e-calendar-table.c:330
 msgid "Public"
 msgstr "Ümumi"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
+#: calendar/gui/e-calendar-table.c:331
 msgid "Private"
 msgstr "Şəxsi"
 
-#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
+#: calendar/gui/e-calendar-table.c:332
 msgid "Confidential"
 msgstr "Gizli"
 
-#: 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:201
+#: 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
 msgid "Unknown"
 msgstr "Namə'lum"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "S"
 msgstr "Baz."
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "W"
 msgstr "Çərş."
 
-#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: 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:351 mail/message-list.c:626
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
 msgid "High"
 msgstr "Yüksək"
 
-#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
-#: calendar/gui/calendar-model.c:1596
+#: 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:352 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: 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:353 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
 msgid "Low"
 msgstr "Alçaq"
 
-#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
+#: calendar/gui/e-calendar-table.c:406
 msgid "Transparent"
 msgstr "Şəffaf"
 
-#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
+#: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
 msgstr "Mat"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: 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:425
+#: calendar/gui/e-calendar-table.c:426
 msgid "Not Started"
 msgstr "Başlamayıb"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: 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:426
+#: calendar/gui/e-calendar-table.c:427
 msgid "In Progress"
 msgstr "İşləyir"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: 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:427
+#: calendar/gui/e-calendar-table.c:428
 msgid "Completed"
 msgstr "Bitirmə Tarixi"
 
-#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: 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:428
+#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
+#: camel/camel-service.c:586
 msgid "Cancelled"
 msgstr "Ləğv Edildi"
 
 #. 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:791 e-util/e-time-utils.c:278
 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:800 e-util/e-time-utils.c:286
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:805
+#: calendar/gui/calendar-model.c:799
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1563,25 +1673,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:885
+#: calendar/gui/calendar-model.c:879
 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: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:1119
-#: 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: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
 msgid "None"
 msgstr "Yoxdur"
 
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:967
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1591,41 +1700,41 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1013
+#: calendar/gui/calendar-model.c:1007
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 "Faiz qiyməti ikisi də daxil olam üzərə 0 ilə 100 arasında olmalıdır"
 
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1048
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "Üstünlük 'Yüksək', 'Normal', 'Alçaq' və ya 'Təsvirsiz' ola bilər."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/calendar-model.c:1061
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:355
 msgid "Undefined"
 msgstr "Təsvirsiz"
 
-#: calendar/gui/calendar-model.c:1108
+#: calendar/gui/calendar-model.c:1102
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 "Şəffaflıq 'Şəffaf', 'İşıq Keçirməz' və ya 'Heç Biri' olmalıdır."
 
-#: calendar/gui/calendar-model.c:1598
+#: calendar/gui/calendar-model.c:1571
 msgid "Recurring"
 msgstr "Təkrarlayan"
 
-#: calendar/gui/calendar-model.c:1600
+#: calendar/gui/calendar-model.c:1573
 msgid "Assigned"
 msgstr "Vəzifələndirilmiş"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 msgid "Yes"
 msgstr "Bəli"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 msgid "No"
 msgstr "Xeyr"
 
@@ -1690,23 +1799,23 @@ 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:63 calendar/gui/main.c:49
+#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
 msgid "Could not initialize GNOME"
 msgstr "GNOME başladıla bilmədi"
 
-#: calendar/gui/alarm-notify/notify-main.c:73
+#: calendar/gui/alarm-notify/notify-main.c:77
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm vermə xidməti e'malatxanası yaradıla bilmir"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+#: 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-notify-dialog.c:191
+#: 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-notify-dialog.c:202
+#: calendar/gui/dialogs/alarm-notify-dialog.c:207
 msgid "No summary available."
 msgstr "Mündəricat yoxdur."
 
@@ -1795,7 +1904,7 @@ msgid "Display options"
 msgstr "Göstərmə Seçənəkləri :"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:162
 msgid "Due Date"
 msgstr "Uyğun Tarix"
 
@@ -1816,7 +1925,7 @@ msgid "Fri"
 msgstr "Cüm"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
 msgid "Friday"
 msgstr "Cümə"
 
@@ -1845,7 +1954,7 @@ msgid "Mon"
 msgstr "B.e"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
 msgid "Monday"
 msgstr "Bazar ertəsi"
 
@@ -1858,12 +1967,12 @@ msgid "Overdue Items:"
 msgstr "Vaxtı Keçmiş İşlər:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:45
 msgid "Pick a color"
 msgstr "Rəng al"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:165
 msgid "Priority"
 msgstr "Üstünlük"
 
@@ -1881,7 +1990,7 @@ msgid "Sat"
 msgstr "Şn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:482
 msgid "Saturday"
 msgstr "Şənbə"
 
@@ -1906,7 +2015,7 @@ msgid "Sun"
 msgstr "Baz"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:483
 msgid "Sunday"
 msgstr "Bazar"
 
@@ -1919,7 +2028,7 @@ msgid "Thu"
 msgstr "C.a"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
 msgid "Thursday"
 msgstr "Cümə Axşamı"
 
@@ -1940,7 +2049,7 @@ msgid "Tue"
 msgstr "Ç.a"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
 msgid "Tuesday"
 msgstr "Çərşənbə axşamı"
 
@@ -1953,7 +2062,7 @@ msgid "Wed"
 msgstr "Çər"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
 msgid "Wednesday"
 msgstr "Çərşənbə"
 
@@ -1966,34 +2075,34 @@ 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:86
+#: mail/mail-config.glade.h:78
 msgid "seconds."
 msgstr "saniyə."
 
-#: calendar/gui/dialogs/delete-comp.c:68
+#: calendar/gui/dialogs/delete-comp.c:70
 #, 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əyirsinizmi?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:73
 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əyirsinizmi?"
 
-#: calendar/gui/dialogs/delete-comp.c:77
+#: calendar/gui/dialogs/delete-comp.c:79
 #, 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əyirsinizmi?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:82
 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əyirsinizmi?"
 
-#: calendar/gui/dialogs/delete-comp.c:86
+#: calendar/gui/dialogs/delete-comp.c:88
 #, 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əyirsinizmi?"
 
-#: calendar/gui/dialogs/delete-comp.c:89
+#: calendar/gui/dialogs/delete-comp.c:91
 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əyirsinizmi?"
 
@@ -2007,7 +2116,7 @@ msgid "% Comp_lete:"
 msgstr "% _Qurtardı:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:158
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Sinifləndirmələr"
@@ -2074,303 +2183,305 @@ msgstr "_Üstünlük:"
 msgid "_Status:"
 msgstr "_Hal:"
 
-#: calendar/gui/dialogs/task-editor.c:689
+#: calendar/gui/dialogs/task-editor.c:697
 msgid "Edit Task"
 msgstr "Vəzifəni Düzəlt"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
+#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
 msgid "No summary"
 msgstr "Mündəricat yoxdur"
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
+#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
 #, c-format
 msgid "Appointment - %s"
 msgstr "İclas - %s"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
 #, c-format
 msgid "Task - %s"
 msgstr "Vəzifə - %s"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
+#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Jurnal üzvü - %s"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:157
 msgid "Categories"
 msgstr "Kateqoriyalar"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:159
 msgid "Completion Date"
 msgstr "Qurtarma Vaxtı"
 
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:160
 msgid "End Date"
 msgstr "Son Tarix"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:161
 msgid "Start Date"
 msgstr "Başlama Tarixi"
 
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:163
 msgid "Geographical Position"
 msgstr "Çoğrafi Yerləşmə"
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:164
 msgid "Percent complete"
 msgstr "Faiz Qurtardı"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:166
 msgid "Summary"
 msgstr "Mündəricat"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:167
 msgid "Transparency"
 msgstr "Şəffaf"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:168
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/e-calendar-table.c:169
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.c:169
+#: 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/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:374
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:375
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:376
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:377
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:378
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:379
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:380
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:381
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:382
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:383
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:384
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:550
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark Complete"
 msgstr "İşarətləmə qurtadı"
 
-#: calendar/gui/e-calendar-table.c:551
+#: 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:556
+#: 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:557
+#: calendar/gui/e-calendar-table.c:558
 msgid "Edit the task"
 msgstr "Vəzifəni Düzəlt"
 
-#: calendar/gui/e-calendar-table.c:559
+#: calendar/gui/e-calendar-table.c:560
 #: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "Vəzifəni sil"
 
-#: calendar/gui/e-calendar-table.c:560
+#: calendar/gui/e-calendar-table.c:561
 msgid "Delete the task"
 msgstr "Bu vəzifəni sil"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: 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:271 calendar/gui/e-day-view.c:1281
-#: calendar/gui/e-week-view-main-item.c:321
+#: 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"
 
 #. 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
+#: 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:279 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:344
+#: 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"
 
 #. 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
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:617
 msgid "am"
 msgstr "am"
 
 #. 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
+#: 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-day-view.c:3027 ui/evolution-calendar.xml.h:16
+#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 msgid "New Appointment"
 msgstr "Yeni İclas"
 
-#: calendar/gui/e-day-view.c:3029 calendar/gui/e-week-view.c:3237
+#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
 #, fuzzy
 msgid "New All Day Event"
 msgstr "Günün bü_tün hadisələri"
 
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3242
+#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
 #, fuzzy
 msgid "Go to Today"
 msgstr "Günə Get"
 
-#: calendar/gui/e-day-view.c:3036 calendar/gui/e-week-view.c:3244
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
 #, fuzzy
 msgid "Go to Date..."
 msgstr "Tarixə Get"
 
-#: 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
+#: 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 "Aç"
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3252
+#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
 msgid "Delete this Appointment"
 msgstr "Bu İclası sil"
 
-#: calendar/gui/e-day-view.c:3047 calendar/gui/e-week-view.c:3254
+#: 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:3056 calendar/gui/e-week-view.c:3267
+#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
 msgid "Make this Occurrence Movable"
 msgstr "Bu hadisənin daşına bilməsinə imkan ver"
 
-#: calendar/gui/e-day-view.c:3058 calendar/gui/e-week-view.c:3269
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
 msgid "Delete this Occurrence"
 msgstr "Bu Hadisəni sil"
 
-#: calendar/gui/e-day-view.c:3060
+#: calendar/gui/e-day-view.c:3179
 msgid "Delete all Occurrences"
 msgstr "Bütün Hadisələri sil"
 
-#: calendar/gui/e-itip-control.c:153
+#: 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:159 calendar/gui/e-itip-control.c:502
+#: 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:165
+#: 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:189
+#: 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:450 calendar/gui/e-itip-control.c:521
+#: 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:462
+#: 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:475
+#: 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:491
+#: 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:532
+#: 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:542
+#: 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:686
+#: 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:772
+#: calendar/gui/e-itip-control.c:780
 msgid "Add to Calendar"
 msgstr "Təqvimə Əlavə Et"
 
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
+#: calendar/gui/e-itip-control.c:814
+#, fuzzy
+msgid " Accept "
 msgstr "Qəbul Et"
 
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
+#: calendar/gui/e-itip-control.c:815
+#, fuzzy
+msgid " Decline "
 msgstr "Rədd Et"
 
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
+#: calendar/gui/e-itip-control.c:816
+#, fuzzy
+msgid " Tentative "
 msgstr "Girişimli"
 
-#: calendar/gui/e-itip-control.c:852
+#: calendar/gui/e-itip-control.c:860
 msgid "Update Calendar"
 msgstr "Təqvimi Güncəllə"
 
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:883
 msgid "Cancel Meeting"
 msgstr "Görüşü Ləğv Et"
 
@@ -2387,7 +2498,7 @@ msgstr "-- --"
 msgid "Calendar Message"
 msgstr "Təqvim İsmarıcı"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:598
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
 msgid "Date:"
 msgstr "Tarix:"
 
@@ -2399,9 +2510,10 @@ msgstr "Təqvim yüklənir..."
 msgid "Organizer:"
 msgstr "Təşkilatçı:"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:43
-msgid "Sender"
-msgstr "Göndərən"
+#: calendar/gui/e-itip-control.glade.h:10
+#, fuzzy
+msgid "Server Message:"
+msgstr "İsmarıcı Fərqli Qeyd Et..."
 
 #: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
@@ -2491,26 +2603,26 @@ msgstr ""
 "Vaxt\n"
 "Planlaşdır"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:48
-#: mail/message-list.c:1014
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
+#: mail/message-list.c:1052
 msgid "Status"
 msgstr "Hal"
 
-#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
-#: calendar/gui/e-tasks.c:501
+#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
+#: calendar/gui/e-tasks.c:502
 msgid "All"
 msgstr "Hamısı"
 
-#: calendar/gui/e-tasks.c:154
+#: calendar/gui/e-tasks.c:155
 msgid "Category:"
 msgstr "Kateqoriyalar:"
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:298
 #, 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:309
+#: calendar/gui/e-tasks.c:310
 #, 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"
@@ -2518,15 +2630,15 @@ msgstr "`%s' i(ı) yükləməyə yarayan yol dəstəklənmir"
 #. 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
+#: calendar/gui/e-week-view-main-item.c:342
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3235 calendar/gui/e-week-view.c:3258
+#: 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:3271
+#: calendar/gui/e-week-view.c:3314
 msgid "Delete All Occurrences"
 msgstr "Bütün Hadisələri Sil"
 
@@ -2563,7 +2675,7 @@ msgid "No recurrence"
 msgstr "Təkrarlama yoxudr"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1577
+#: calendar/gui/event-editor.c:1579
 msgid "Play a sound"
 msgstr "Səs çal"
 
@@ -2584,12 +2696,12 @@ msgid "Reminder"
 msgstr "Xatırladıcı"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1586
+#: calendar/gui/event-editor.c:1588
 msgid "Run a program"
 msgstr "Proqramı işə sal"
 
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1583
+#: calendar/gui/event-editor.c:1585
 msgid "Send an email"
 msgstr "ePoçt göndər"
 
@@ -2598,7 +2710,7 @@ msgid "Settings..."
 msgstr "Qurğular..."
 
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1580
+#: calendar/gui/event-editor.c:1582
 msgid "Show a dialog"
 msgstr "Dialoqu göstər"
 
@@ -2618,12 +2730,11 @@ msgstr "_Başlama vaxt:"
 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
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
 msgid "after"
 msgstr "sonra"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
 msgid "before"
 msgstr "əvvəl"
 
@@ -2647,7 +2758,7 @@ msgstr "həmişə"
 msgid "hour(s)"
 msgstr "saat"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
 msgid "minute(s)"
 msgstr "dəqiqə"
 
@@ -2671,97 +2782,97 @@ msgstr "həftə"
 msgid "year(s)"
 msgstr "il"
 
-#: calendar/gui/event-editor.c:371
+#: calendar/gui/event-editor.c:373
 msgid "Edit Appointment"
 msgstr "İclası düzəlt"
 
-#: calendar/gui/event-editor.c:449
+#: calendar/gui/event-editor.c:451
 msgid "on"
 msgstr "..da"
 
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
 msgid "day"
 msgstr "gün"
 
-#: calendar/gui/event-editor.c:601
+#: calendar/gui/event-editor.c:603
 msgid "on the"
 msgstr "...da (də)"
 
-#: calendar/gui/event-editor.c:608
+#: calendar/gui/event-editor.c:610
 msgid "th"
 msgstr "."
 
-#: calendar/gui/event-editor.c:754
+#: calendar/gui/event-editor.c:756
 msgid "occurrences"
 msgstr "hadisələr"
 
-#: calendar/gui/event-editor.c:871
+#: calendar/gui/event-editor.c:873
 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:1532
+#: calendar/gui/event-editor.c:1534
 #, c-format
 msgid " %d days"
 msgstr "%d gün"
 
-#: calendar/gui/event-editor.c:1534
+#: calendar/gui/event-editor.c:1536
 msgid " 1 day"
 msgstr "1 gün"
 
-#: calendar/gui/event-editor.c:1537
+#: calendar/gui/event-editor.c:1539
 #, c-format
 msgid " %d weeks"
 msgstr "%d həftə"
 
-#: calendar/gui/event-editor.c:1539
+#: calendar/gui/event-editor.c:1541
 msgid " 1 week"
 msgstr "2 həftə"
 
-#: calendar/gui/event-editor.c:1542
+#: calendar/gui/event-editor.c:1544
 #, c-format
 msgid " %d hours"
 msgstr "%d saat"
 
-#: calendar/gui/event-editor.c:1544
+#: calendar/gui/event-editor.c:1546
 msgid " 1 hour"
 msgstr "1 saat"
 
-#: calendar/gui/event-editor.c:1547
+#: calendar/gui/event-editor.c:1549
 #, c-format
 msgid " %d minutes"
 msgstr "%d dəqiqə"
 
-#: calendar/gui/event-editor.c:1549
+#: calendar/gui/event-editor.c:1551
 msgid " 1 minute"
 msgstr "1 dəqiqə"
 
-#: calendar/gui/event-editor.c:1552
+#: calendar/gui/event-editor.c:1554
 #, c-format
 msgid " %d seconds"
 msgstr "%d saniyə"
 
-#: calendar/gui/event-editor.c:1554
+#: calendar/gui/event-editor.c:1556
 msgid " 1 second"
 msgstr "1 saniyə"
 
-#: calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1603
 msgid " before start of appointment"
 msgstr "iclasın başlanğıcından əvvəl"
 
-#: calendar/gui/event-editor.c:1603
+#: calendar/gui/event-editor.c:1605
 msgid " after start of appointment"
 msgstr "iclasın başlanğıcından sonra"
 
-#: calendar/gui/event-editor.c:1611
+#: calendar/gui/event-editor.c:1613
 msgid " before end of appointment"
 msgstr "iclas qurtarandan əvvəl"
 
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/event-editor.c:1615
 msgid " after end of appointment"
 msgstr "iclas qurtarandan sonra"
 
-#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
-#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
+#: 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"
 
@@ -2797,12 +2908,12 @@ msgstr "Təqvim iTip nümayiş idarəsi e'malatxanası."
 msgid "Factory for the sample Calendar control"
 msgstr "Nümunəvi Təqvim idarəsi e'malaxanası"
 
-#: calendar/gui/gnome-cal.c:695
+#: calendar/gui/gnome-cal.c:700
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/gnome-cal.c:706
+#: calendar/gui/gnome-cal.c:711
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' i(ı) açmağa yarayan yol dəstəklənmir"
@@ -2863,201 +2974,201 @@ msgstr "Oktyabr"
 msgid "September"
 msgstr "Sentyabr"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "1st"
 msgstr "1.nci"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "2nd"
 msgstr "2.nci"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "3rd"
 msgstr "3.ncü"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "4th"
 msgstr "4.ncü"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "5th"
 msgstr "5.nci"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "6th"
 msgstr "6.ncı"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "7th"
 msgstr "7.nci"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "8th"
 msgstr "8.nci"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "9th"
 msgstr "9.ncu"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "10th"
 msgstr "10.ncu"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "11th"
 msgstr "11.nci"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "12th"
 msgstr "12.nci"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "13th"
 msgstr "13.ncü"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "14th"
 msgstr "14.ncü"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "15th"
 msgstr "15.nci"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "16th"
 msgstr "16.ncı"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "17th"
 msgstr "17.nci"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "18th"
 msgstr "18.nci"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "19th"
 msgstr "19.ncu"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "20th"
 msgstr "20.nci"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "21st"
 msgstr "21.nci"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "22nd"
 msgstr "22.nci"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "23rd"
 msgstr "23.ncü"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "24th"
 msgstr "24.ncü"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "25th"
 msgstr "25.nci"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "26th"
 msgstr "26.ncı"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "27th"
 msgstr "27.nci"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "28th"
 msgstr "28.nci"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "29th"
 msgstr "29.ncu"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "30th"
 msgstr "39.ncu"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:306
 msgid "31st"
 msgstr "31.nci"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Su"
 msgstr "Baz."
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Mo"
 msgstr "B.ei"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Tu"
 msgstr "Ç.a"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "We"
 msgstr "Çə"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Th"
 msgstr "C.a"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Fr"
 msgstr "Cümə"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Sa"
 msgstr "Şn"
 
-#: calendar/gui/print.c:944
+#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Vəzifə"
 
 #. Day
-#: calendar/gui/print.c:1074
+#: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
 msgstr "Hazırkı gün ( %a %b %d %Y )"
 
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1089
+#: calendar/gui/print.c:1093
 msgid "%a %d %Y"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1104
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Hazırkı həftə ( %s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1108
+#: calendar/gui/print.c:1112
 msgid "Current month (%b %Y)"
 msgstr "Hazırkı ay ( %b %Y )"
 
 #. Year
-#: calendar/gui/print.c:1115
+#: calendar/gui/print.c:1119
 msgid "Current year (%Y)"
 msgstr "Hazırkı il ( %Y )"
 
-#: calendar/gui/print.c:1152
+#: calendar/gui/print.c:1156
 msgid "Print Calendar"
 msgstr "Təqvimi çap et"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1334
+#: 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:29
+#: ui/evolution-mail.xml.h:52
 msgid "Print Preview"
 msgstr "Çap Etmə nümayişi"
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/tasks-control.c:108
 msgid "The URI of the tasks folder to display"
 msgstr "Göstəriləcək vəzifələr qovluğunun URIsi"
 
@@ -3099,26 +3210,105 @@ msgstr ""
 "`%s' yükləmək üçün işlədiləcən metod dəstəkləmir;  təqvim "
 "qovluğuna heç bir vəzifə vəzifələr qovluğuna daşına bilməyəcək."
 
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
+#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr "BBeÇaÇCaCŞ"
 
-#: camel/camel-filter-driver.c:846
+#: camel/camel-cipher-context.c:169
+#, fuzzy
+msgid "Signing is not supported by this cipher"
+msgstr "Bu qeydlərdə belirtilen növ dəstəklənmir"
+
+#: camel/camel-cipher-context.c:207
+#, fuzzy
+msgid "Clearsigning is not supported by this cipher"
+msgstr "Bu qeydlərdə belirtilen növ dəstəklənmir"
+
+#: camel/camel-cipher-context.c:245
+#, fuzzy
+msgid "Verifying is not supported by this cipher"
+msgstr "Bu qeydlərdə belirtilen növ dəstəklənmir"
+
+#: camel/camel-cipher-context.c:286
+#, fuzzy
+msgid "Encryption is not supported by this cipher"
+msgstr "Bu qeydlərdə belirtilen növ dəstəklənmir"
+
+#: camel/camel-cipher-context.c:326
+#, fuzzy
+msgid "Decryption is not supported by this cipher"
+msgstr "Bu qeydlərdə belirtilen növ dəstəklənmir"
+
+#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#, fuzzy
+msgid "Syncing folders"
+msgstr "Qovluq sinxronlaşdırılır"
+
+#: camel/camel-filter-driver.c:643
+#, fuzzy
+msgid "Unable to open spool folder"
+msgstr "Ünvan dəftərini aça bilmədim"
+
+#: camel/camel-filter-driver.c:652
+#, fuzzy
+msgid "Unable to process spool folder"
+msgstr ""
+"'%s' Qovluğu qeydiyyatdan keçirilə bilmədi:\n"
+"%s"
+
+#: camel/camel-filter-driver.c:666
+#, fuzzy
+msgid "Getting message %d (%d%%)"
+msgstr "%d nin(nın) %d ismarıcı yazılır"
+
+#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#, fuzzy, c-format
+msgid "Failed message %d"
+msgstr "_Məktub İsmarıcı"
+
+#: camel/camel-filter-driver.c:671
+#, fuzzy
+msgid "Cannot open message"
+msgstr ""
+"İSmarıc alına bilmir: %s\n"
+"   %s"
+
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#, fuzzy
+msgid "Syncing folder"
+msgstr "Qovluq sinxronlaşdırılır"
+
+#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
+#, fuzzy
+msgid "Complete"
+msgstr "Bitirmə Tarixi"
+
+#: camel/camel-filter-driver.c:748
+#, fuzzy, c-format
+msgid "Getting message %d of %d"
+msgstr "%d nin(nın) %d ismarıcı yazılır"
+
+#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#, fuzzy, c-format
+msgid "Failed at message %d of %d"
+msgstr "%d nin(nın) %d ismarıcı yazılır"
+
+#: camel/camel-filter-driver.c:866
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Alıcı süzgəc xətası: %s: %s"
 
-#: camel/camel-filter-driver.c:851
+#: camel/camel-filter-driver.c:871
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "İşə salıcı süzgəc xətası: %s: %s"
 
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "İşə salıcı süzgəc axtarışı xətası: %s: %s"
 
-#: camel/camel-folder-search.c:323
+#: camel/camel-folder-search.c:328
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3127,7 +3317,7 @@ msgstr ""
 "Axtarış ifadəsi darana bilmir:%s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:338
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3136,148 +3326,221 @@ msgstr ""
 "İşə salıcı axtarış ifadəsi darama xətası:%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 "(hamısını yoxla) tək düzgün nəticə istəyir"
 
-#: camel/camel-folder-search.c:554
+#: camel/camel-folder-search.c:559
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Namə'lum başlıqda sorǧu aparılır: %s"
 
-#: 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 "Cismdə hökmsüz yazı, kəlimə xaric"
 
 #. 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 camel/camel-movemail.c:138
+#: camel/camel-movemail.c:185
 #, 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:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151 camel/camel-movemail.c:219
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "%s dakı(dəki) qıfıl fayllının alınması müddəti doldu. Yenidən "
 "sına."
 
-#: camel/camel-lock.c:199
+#: 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"
 
-#: camel/camel-lock.c:253
+#: 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"
 
-#: camel/camel-movemail.c:99
+#: camel/camel-movemail.c:101
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "%s məktub faylı yoxlana bilmir: %s"
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:148
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "%s məktub faylı açıla bilmir: %s"
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:158
 #, 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:197
+#: 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:243
+#: 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:254
+#: 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:272
+#: camel/camel-movemail.c:274
 #, 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:304
+#: camel/camel-movemail.c:306
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Boru yaradıla bilmədi: %s"
 
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:318
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Çəngəllənə bilmədi: %s"
 
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:356
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Məktub daşıma proqramı iflas etdi: %s"
 
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:357
 msgid "(Unknown error)"
 msgstr "(Namə'lum xəta)"
 
-#: camel/camel-provider.c:137
+#: camel/camel-movemail.c:587
+#, fuzzy, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "Müvəqqəti məktub faylı yazılması xətası: %s"
+
+#: camel/camel-pgp-context.c:186
+#, 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:189
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Lütfən %s parol kəlimənizi girin"
+
+#: camel/camel-pgp-context.c:509
+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
+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:1028
+#: camel/camel-pgp-context.c:1242
+#, 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
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:871
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:888
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Müvəqqəti fayl yaradıla bilmir: %s"
+
+#: camel/camel-pgp-context.c:1011
+#, fuzzy
+msgid "No plaintext to encrypt."
+msgstr "Kodu açmaq üçün timsala basın."
+
+#: camel/camel-pgp-context.c:1037
+msgid "No recipients specified"
+msgstr "Alıcı bildirilməyib"
+
+#: camel/camel-pgp-context.c:1227
+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 "%s yüklənə bilmədi: %s"
 
-#: camel/camel-provider.c:145
+#: camel/camel-provider.c:148
 #, c-format
 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:181
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s server %s"
 msgstr "%s verici %s"
 
-#: camel/camel-remote-store.c:185
+#: camel/camel-remote-store.c:190
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s üstündə %s üçün %s xidmətləri"
 
-#: camel/camel-remote-store.c:232
+#: camel/camel-remote-store.c:240
 msgid "Connection cancelled"
 msgstr "Bağlantı Ləğv edildi"
 
-#: camel/camel-remote-store.c:235
-#: camel/providers/smtp/camel-smtp-transport.c:245
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:261
 #, 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:236
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(namə'lum ev sahibi)"
 
-#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
-#: camel/camel-remote-store.c:450
-#: camel/providers/imap/camel-imap-command.c:289
+#: 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
 msgid "Operation cancelled"
 msgstr "Əməliyyat ləğv edildi"
 
-#: camel/camel-remote-store.c:456
+#: camel/camel-remote-store.c:464
 msgid "Server unexpectedly disconnected"
 msgstr "Verici gözlanilməz şakildə bağlantını kəsdi"
 
-#: 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 ""
+"Bu seçənəklə siz IMAP vericisinə düz mətn parol ilə bağlana "
+"biləcəksiniz."
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Tanıtma bacarılmadı."
 
-#: camel/camel-sasl-anonymous.c:106
+#: camel/camel-sasl-anonymous.c:119
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -3286,7 +3549,7 @@ msgstr ""
 "Hökmsüz ePoçt ünvanı iz mə'lumatı:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:118
+#: camel/camel-sasl-anonymous.c:131
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -3295,7 +3558,7 @@ msgstr ""
 "Hökmsüz mə'nasız iz mə'lumatı:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:130
+#: camel/camel-sasl-anonymous.c:143
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -3304,11 +3567,11 @@ msgstr ""
 "Hökmsüz iz mə'lumatı:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:11
+#: 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."
@@ -3316,11 +3579,11 @@ msgstr ""
 "Bu seçənək ,əgər dəstəkləyirsə, verici ilə CRAM-MD5 parolu ilə "
 "ünsiyyət quracaqdır."
 
-#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:19
+#: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: 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."
@@ -3328,41 +3591,41 @@ msgstr ""
 "Bu seçənək ,əgər dəstəkləyirsə, verici ilə DIGEST-MD5 parolu ilə "
 "ünsiyyət quracaqdır."
 
-#: camel/camel-sasl-digest-md5.c:761
+#: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Verici çox uzun dəvət verir (>2048 oktet)\n"
 
-#: camel/camel-sasl-digest-md5.c:770
+#: camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge invalid\n"
 msgstr "Verici dəvəti hökmsüzdür\n"
 
-#: 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 "Verici dəvətində hömksüz \"Qoruma Keyfiyyəti\" bileti vardır\n"
 
-#: camel/camel-sasl-digest-md5.c:798
+#: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
 msgstr "Verici cavabındakı tanıtma mə'lumatı  düzgün deyildir\n"
 
-#: camel/camel-sasl-digest-md5.c:816
+#: camel/camel-sasl-digest-md5.c:865
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Verici cavabındakı tanıtma mə'lumatı natamamdır\n"
 
-#: camel/camel-sasl-digest-md5.c:826
+#: camel/camel-sasl-digest-md5.c:875
 msgid "Server response does not match\n"
 msgstr "Verci cavabı uyğun gəlmir\n"
 
-#: 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 ""
 "Bu seçənəklə siz vericisiyə Kerberos 4 tanıdılması yolu ilə "
 "bağlana biləcəksiniz."
 
-#: camel/camel-sasl-kerberos4.c:158
+#: camel/camel-sasl-kerberos4.c:161
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -3371,68 +3634,73 @@ msgstr ""
 "Kerberos bileti alına bilmir:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:417
 msgid "Bad authentication response from server."
 msgstr "Vericidən xətalı tanıtma istəyi alındı."
 
-#: camel/camel-sasl-plain.c:29
-msgid "PLAIN"
-msgstr "PLAIN"
-
-#: 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-plain.c:34
+#, fuzzy
+msgid "This option will connect to the server using a simple password."
 msgstr ""
-"Bu seçənək ,əgər dəstəkləyirsə, verici ilə PLAIN SASL mexanizması "
-"ilə ünsiyyət quracaqdır."
+"Bu seçənəklə siz IMAP vericisinə düz mətn parol ilə bağlana "
+"biləcəksiniz."
 
-#: camel/camel-search-private.c:105
+#: camel/camel-search-private.c:110
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Qaydalı ifadə dərlanməsi bacarılmadı: %s: %s"
 
-#: camel/camel-service.c:142
+#: camel/camel-service.c:152
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URLsi istifadəçi adına ehtiyac hiss edir"
 
-#: camel/camel-service.c:151
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URLsi ev sahibinə ehtiyac hiss edir"
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:168
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URLsi yola ehtiyac hiss edir"
 
-#: camel/camel-service.c:512
+#: camel/camel-service.c:554
+#, fuzzy, c-format
+msgid "Resolving: %s"
+msgstr "\"%s\" Sınanır"
+
+#: camel/camel-service.c:581
+#, c-format
+msgid "Failure in name lookup: %s"
+msgstr ""
+
+#: camel/camel-service.c:606
 #, c-format
-msgid "No such host %s."
-msgstr "%s Ev sahibi mövcud deyildir."
+msgid "Host lookup failed: %s: host not found"
+msgstr ""
 
-#: camel/camel-service.c:515
+#: camel/camel-service.c:608
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "%s ev sahibi müvəqqəti olaraq axtarıla bilmir."
+msgid "Host lookup failed: %s: unknown reason"
+msgstr ""
 
-#: camel/camel-session.c:54
+#: camel/camel-session.c:57
 msgid "Virtual folder email provider"
 msgstr "_Virtual Qovluq Sehirbazı ..."
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:59
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 "Başqa qovluq dəstələrinin istəyi olan məktubların oxunması üçün"
 
-#: camel/camel-session.c:322
+#: camel/camel-session.c:274 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:417
+#: camel/camel-session.c:462
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3442,129 +3710,147 @@ msgstr ""
 "%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
+#: 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 "Zibil Qutusu"
 
-#: camel/camel-url.c:77
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "`%s' URL kəliməsi protokol haqqında mə'lumat daxil etmir"
-
-#: camel/camel-url.c:92
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "`%s' URL kəliməsi hökmsüz protokol haqqında mə'lumat daxil edir"
-
-#: camel/camel-url.c:152
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
+#: camel/camel-url.c:289
+#, fuzzy, c-format
+msgid "Could not parse URL `%s'"
 msgstr ""
-"`%s' URLsindəki qapı nömrəßi rəqəm xaricində xarakter daxil edir"
+"`%s' Faylı açıla bilmir:\n"
+"%s"
 
-#: camel/camel-vee-folder.c:960
+#: camel/camel-vee-folder.c:451
+#, fuzzy, c-format
+msgid "No such message %s in %s"
+msgstr "Bele bir ismarıc yoxdur: %s"
+
+#: camel/camel-vee-folder.c:545
 #, c-format
 msgid "No such message: %s"
 msgstr "Bele bir ismarıc yoxdur: %s"
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:209
 #, 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:242
+#: camel/providers/imap/camel-imap-command.c:217
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP əmri iflas etdi: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
+#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr "Namə'lum xəta"
 
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:272
 msgid "Server response ended too soon."
 msgstr "Verci cavabı çox tez sonlandı."
 
-#: camel/providers/imap/camel-imap-command.c:433
+#: camel/providers/imap/camel-imap-command.c:456
 #, 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:469
+#: camel/providers/imap/camel-imap-command.c:490
 #, 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:176
+#: camel/providers/imap/camel-imap-folder.c:172
 #, 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:345
+#: camel/providers/imap/camel-imap-folder.c:351
 msgid "Scanning IMAP folder"
 msgstr "IMAP qovluğu daranır"
 
-#: camel/providers/imap/camel-imap-folder.c:946
-#: camel/providers/imap/camel-imap-folder.c:1143
+#: camel/providers/imap/camel-imap-folder.c:986
+#: camel/providers/imap/camel-imap-folder.c:1197
 #, fuzzy
 msgid "This message is not currently available"
 msgstr ""
 "Bu ismarıcın mövzusu yoxdur .\n"
 "Həqiqətən də göndərim?"
 
-#: camel/providers/imap/camel-imap-folder.c:976
-#: camel/providers/imap/camel-imap-folder.c:1177
+#: camel/providers/imap/camel-imap-folder.c:1016
+#: camel/providers/imap/camel-imap-folder.c:1231
 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:39
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Checking for new mail"
+msgstr "Yeni ePoçt üçün bax"
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Check for new messages in all folders"
+msgstr "Yeni ePoçt üçün bax"
+
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+msgid "Folders"
+msgstr "Qovluqlar"
+
+#: camel/providers/imap/camel-imap-provider.c:50
+#, fuzzy
+msgid "Show only subscribed folders"
+msgstr "\"%s\" qovluğuna qeyd ol"
+
+#: 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 "Ad sahəsi:"
+
+#: 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 ""
 "IMAP vericisində məktubların saxlanması və oxuna bilməsi üçün."
 
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Secure IMAPv4"
-msgstr "E'tibarlı IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "For reading and storing mail on IMAP servers over an SSL connection."
-msgstr ""
-"SSL bağlantısı üstündən IMAP vericisində məktubların saxlanması "
-"və oxuna bilməsi üçün."
-
-#: camel/providers/imap/camel-imap-store.c:307
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Bu seçənəklə siz IMAP vericisinə düz mətn parol ilə bağlana "
 "biləcəksiniz."
 
-#: camel/providers/imap/camel-imap-store.c:448
+#: camel/providers/imap/camel-imap-store.c:440
 #, 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:458
+#: camel/providers/imap/camel-imap-store.c:450
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, 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:483
+#: camel/providers/imap/camel-imap-store.c:475
 #, 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:498
-#: camel/providers/smtp/camel-smtp-transport.c:376
+#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:403
 msgid "You didn't enter a password."
 msgstr "Parolu girmədiniz."
 
-#: camel/providers/imap/camel-imap-store.c:526
-#: camel/providers/smtp/camel-smtp-transport.c:384
+#: camel/providers/imap/camel-imap-store.c:518
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3575,95 +3861,100 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:878
+#: camel/providers/imap/camel-imap-store.c:865
+#, fuzzy, c-format
+msgid "%s is not a selectable folder"
+msgstr "Seçili qovluğu göstər"
+
+#: camel/providers/imap/camel-imap-store.c:879
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s qovluğunu yarada bilmədim: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1335
+#: camel/providers/imap/camel-imap-store.c:1382
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/local/camel-local-provider.c:39
 msgid "MH-format mail directories"
 msgstr "MH-şəklində məktub qovluqları"
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:40
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 "Yerli məktubların MH oxşarı məktub qovluqlarında saxlamaq üçün"
 
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:49
 msgid "Standard Unix mailbox file"
 msgstr "Standart UNIX məktub qutusu faylı"
 
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:50
 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:58
+#: camel/providers/local/camel-local-provider.c:59
 msgid "Qmail maildir-format mail files"
 msgstr "Qmail məktun qovluğu şəklindəki məktub faylı"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 "Yerli məktubları qmail məktub qovluqlarında saxlaya bilmək üçün"
 
-#: camel/providers/local/camel-local-store.c:128
+#: camel/providers/local/camel-local-store.c:129
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s kök saxlama dəqiq bir yol deyildir"
 
-#: camel/providers/local/camel-local-store.c:135
+#: camel/providers/local/camel-local-store.c:136
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "%s kök saxlama düzgün bir qovluq deyildir."
 
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:144
+#: camel/providers/local/camel-local-store.c:160
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Qovluq alına bilmədi: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:175
 msgid "Local stores do not have an inbox"
 msgstr "Yerli saxlamaların gələnlər qutusu qovluğu yoxdur"
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s Yeli məktub faylı"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:241
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "%s faylı %s adi ilə yenidən adlandırıla bilmir: %s"
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:283
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "`%s' Qovluq mündəricat faylı silinə bilmir: %s"
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:293
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "`%s' Qovluq indeks faylı silinə bilmir: %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-maildir-folder.c:150
+#: camel/providers/local/camel-maildir-folder.c:158
+#: camel/providers/local/camel-maildir-folder.c:169
 #, 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: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: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
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3672,19 +3963,19 @@ msgstr ""
 "İSmarıc alına bilmir: %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:197
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
 msgid "No such message"
 msgstr "Belə bir ismarıc yoxdur"
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:203
 msgid "Invalid message contents"
 msgstr "Hökmsüz ismarıc mövtəviyyatı"
 
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
+#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -3693,15 +3984,15 @@ msgstr ""
 "`%s' qovluğu açıla bilmir: \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:100
+#: 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:105
-#: camel/providers/local/camel-mh-store.c:101
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3710,35 +4001,40 @@ msgstr ""
 "`%s' qovluğu yaradıla bilmədi:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:120
+#: camel/providers/local/camel-maildir-store.c:122
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' məktub qovluğu faylı deyildir."
 
-#: 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:151
+#: camel/providers/local/camel-maildir-store.c:188
+#: 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:150
+#: camel/providers/local/camel-maildir-store.c:152
 msgid "not a maildir directory"
 msgstr "məktub qovluğu faylı deyildir"
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:152
+#, fuzzy, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "Qovluq alına bilmədi: %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:203
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Məktub qutusu açıla bilmir: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "İsmarıc mbox fayllına əlava edilə bimir: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:335
+#: camel/providers/local/camel-mbox-folder.c:367
+#: camel/providers/local/camel-mbox-folder.c:380
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3747,15 +4043,15 @@ msgstr ""
 "İsmarıc alına bilmir: %s qovluğundan %s\n"
 "   %s"
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:368
 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:379
+#: camel/providers/local/camel-mbox-folder.c:381
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "İSmarıc quruluşu bacarılmadı: Məktub qutusu yoxsa xəsərlidir?"
 
-#: camel/providers/local/camel-mbox-store.c:92
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -3764,7 +4060,7 @@ msgstr ""
 "`%s' Faylı açıla bilmir:\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"
@@ -3773,14 +4069,14 @@ msgstr ""
 "`%s' faylı yaradıla bilmədi: \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' normal bir fayl deyildir ."
 
-#: 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"
@@ -3789,113 +4085,113 @@ msgstr ""
 "`%s' qovluğu silinə bilmir:\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 "`%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:240
+#: camel/providers/local/camel-mbox-summary.c:248
 msgid "Summarising folder"
 msgstr "Qovluq Cəmləşdirilir"
 
-#: camel/providers/local/camel-mbox-summary.c:245
+#: camel/providers/local/camel-mbox-summary.c:253
 #, 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:287
+#: camel/providers/local/camel-mbox-summary.c:295
 #, 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:362
+#: camel/providers/local/camel-mbox-summary.c:370
 #, 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:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1327
+#: camel/providers/local/camel-mbox-summary.c:501
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
 msgid "Synchronising folder"
 msgstr "Qovluq sinxronlaşdırılır"
 
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:506
+#: camel/providers/local/camel-mbox-summary.c:707
 #, 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:515
+#: camel/providers/local/camel-mbox-summary.c:523
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Müvəqqəti məktub qutusu açıla bilmir: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
 #: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:556
 #: camel/providers/local/camel-mbox-summary.c:745
+#: camel/providers/local/camel-mbox-summary.c:753
 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:591
+#: camel/providers/local/camel-mbox-summary.c:599
 #, 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:608
+#: camel/providers/local/camel-mbox-summary.c:616
 #, 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:626
-#: camel/providers/local/camel-mbox-summary.c:795
+#: camel/providers/local/camel-mbox-summary.c:634
+#: camel/providers/local/camel-mbox-summary.c:803
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Qaynaq qovluğu bağlana bilmədi: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:643
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Müvəqqəti qovluq bağlana bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:646
+#: camel/providers/local/camel-mbox-summary.c:654
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:870
+#: camel/providers/local/camel-mbox-summary.c:878
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Namə'lum xəta: %s"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:149
+#: camel/providers/local/camel-mh-folder.c:157
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "mh qovluğuna ismarıc əlavə edilə bilmir: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:108
+#: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' qovluq deyildir."
 
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: 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:62
+#: camel/providers/nntp/camel-nntp-auth.c:66
 msgid "Server rejected username"
 msgstr "Verici istifadəçi adını qəbul etmədi"
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:72
 msgid "Failed to send username to server"
 msgstr "Vericiyə istifadəçi adı göndərilə bilmədi"
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:81
 msgid "Server rejected username/password"
 msgstr "Verici istifadəçi adını/parolunu qəbul etmədi"
 
@@ -3919,11 +4215,11 @@ msgstr "%s üçün qrup siyahısı yüklənə bilmir: %s"
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "%s üçün qrup faylı qeyd edilə bilmir: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr "USENET xəbərləri"
 
-#: 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 ""
 "USENET xəbər qruplarına göndərilmiş hər hansı bir xəbəri oxumaq "
@@ -3961,26 +4257,41 @@ msgstr "POP yığcamlaşdırılması alınır"
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Qovluq açıla bilmir: ismarıc siyahısı bütün deyil."
 
-#: camel/providers/pop3/camel-pop3-folder.c:286
+#: camel/providers/pop3/camel-pop3-folder.c:285
 #, c-format
 msgid "No message with uid %s"
 msgstr "%s uid'li ismarıc yoxdur"
 
-#: camel/providers/pop3/camel-pop3-folder.c:290
+#: camel/providers/pop3/camel-pop3-folder.c:289
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d POP ismarıcı alınır"
 
-#: camel/providers/pop3/camel-pop3-folder.c:308
+#: camel/providers/pop3/camel-pop3-folder.c:307
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "%s POP vericisindən ismarıclar alına bilmədi: %s"
 
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
+#, fuzzy
+msgid "Message storage"
+msgstr "İsmarıc Başlığı"
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+#, fuzzy
+msgid "Leave messages on server"
+msgstr "Vericidan ismarıcları silmə"
+
+#: camel/providers/pop3/camel-pop3-provider.c:41
+#, fuzzy, c-format
+msgid "Delete after %s day(s)"
+msgstr "Bu vəzifəni sil"
+
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
 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."
@@ -3988,21 +4299,7 @@ msgstr ""
 "POP vericilərinə bağlanmaq üçündür. POP protokolu eyni zamanda bə'zi "
 "veb məktub sistemlərindən məktub almaq üçün də işlədilə bilir."
 
-#: camel/providers/pop3/camel-pop3-provider.c:54
-msgid "Secure POP"
-msgstr "E'tibarlı POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:56
-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 ""
-"POP vericilərinə SSL üstündən bağlanmaq üçündür. POP protokolu "
-"eyni zamanda bə'zi veb məktub sistemlərindən məktub almaq üçün də "
-"işlədilə bilir."
-
-#: camel/providers/pop3/camel-pop3-store.c:147
+#: 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."
@@ -4011,7 +4308,7 @@ msgstr ""
 "ünsiyyət quracaqdır.Bu bir çox məktub vericisi tərəfindən "
 "dəstəklənən yeganə seçənəkdir."
 
-#: camel/providers/pop3/camel-pop3-store.c:157
+#: 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 "
@@ -4021,29 +4318,29 @@ msgstr ""
 "ünsiyyət quracaqdır. Bu seçənək bütün vericilər tərəfindən "
 "bütün istifadəçilər üçün dəstəklənməz."
 
-#: camel/providers/pop3/camel-pop3-store.c:169
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Bu seçənək POP verisici ilə Kerberos 4 istifadə edərək ünsiyyət "
 "quracaqdır."
 
-#: camel/providers/pop3/camel-pop3-store.c:214
+#: camel/providers/pop3/camel-pop3-store.c:207
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "KPOP vericisi ilə ünsüyyət qurula bilmir: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:331
+#: camel/providers/pop3/camel-pop3-store.c:319
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "%s üstündəki POP vericisi ilə ünsiyyət qurula bilmir."
 
-#: camel/providers/pop3/camel-pop3-store.c:378
+#: camel/providers/pop3/camel-pop3-store.c:358
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sLütfən %s@%s üçün POP3 parolunuzu girin"
 
-#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:377
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4052,12 +4349,12 @@ msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "İstifadəçi adı göndərilmə xətası oldu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:400
-#: camel/providers/pop3/camel-pop3-store.c:437
+#: camel/providers/pop3/camel-pop3-store.c:380
+#: camel/providers/pop3/camel-pop3-store.c:417
 msgid "(Unknown)"
 msgstr "(Namə'lum)"
 
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:407
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4065,7 +4362,7 @@ msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "İstənən tanıtma protokoluna dəstək verilmir."
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:415
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4074,17 +4371,17 @@ msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "Parol göndərmə xətası oldu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:544
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "`%s' deyə bir qovluq yoxdur."
 
-#: 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:57
 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."
@@ -4092,353 +4389,348 @@ msgstr ""
 "Yerli sistemdəki \"sendmail\" proqramı istifadə edilərək məktub "
 "göndərmək üçün."
 
-#: 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 ""
 "Sendmailə boru(pipe) çəkilə bilmədi bilmədi. %s: məktub "
 "göndərilmədi"
 
-#: 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 "Sendmail çəngəllənə bilmədi: %s: məktub göndərilə bilmədi"
 
-#: 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 "İsmarıc göndərilə bilmədi: %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 %s siqnalı verərək bağlandı: məktub göndərilə bilmədi."
 
-#: 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 "%s işə salına bilmir: məktub göndərilə bilmədi."
 
-#: 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 %d halı ilə bağlandı: məktub göndərilə bilmədi."
 
-#: 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 "İsmarıcda 'Göndərən' ünvanı tapıla bilmədi"
 
-#: 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 "Sendmail proqramı ilə məktub göndərilməsi"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:58
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
 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 ""
 "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-provider.c:53
-msgid "Secure SMTP"
-msgstr "E'tibarlı SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:55
-msgid ""
-"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
-"connection.\n"
-msgstr ""
-"SMTP istifadə edilərək uzaq məktub yayıcısına bağlanaraq məktub "
-"göndərmək üçün.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:148
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaksis xətası, əmr tanınmır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:150
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error in parameters or arguments"
 msgstr "Parametr və ya arqumentlərdə sintaksis xətası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:152
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Command not implemented"
 msgstr "Əmr qəbul edilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:154
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command parameter not implemented"
 msgstr "Əmr parametri qəbul edilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:156
+#: camel/providers/smtp/camel-smtp-transport.c:173
 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:158
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Help message"
 msgstr "Kömək İsmarıcı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:160
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Service ready"
 msgstr "Xidmət hazırdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service closing transmission channel"
 msgstr "Xidmət nəqliyyat kanallarını bağlayır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:164
+#: camel/providers/smtp/camel-smtp-transport.c:181
 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:166
+#: camel/providers/smtp/camel-smtp-transport.c:183
 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:168
+#: camel/providers/smtp/camel-smtp-transport.c:185
 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:170
+#: camel/providers/smtp/camel-smtp-transport.c:187
 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:172
+#: camel/providers/smtp/camel-smtp-transport.c:189
 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:174
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action aborted: error in processing"
 msgstr "Sorğulanan gediş ləğv edildi; xəta oldu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; please try <forward-path>"
 msgstr ""
 "İstifadəçi yerli deyil; lütfən <çatdırma cığırı>nı sınayın"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:195
 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:180
+#: camel/providers/smtp/camel-smtp-transport.c:197
 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:182
+#: camel/providers/smtp/camel-smtp-transport.c:199
 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:184
+#: camel/providers/smtp/camel-smtp-transport.c:201
 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:186
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Transaction failed"
 msgstr "Nəqliyyat bacarılmadı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "A password transition is needed"
 msgstr "Parol nəqli lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Authentication mechanism is too weak"
 msgstr "Tanıtma mexanizması çox zəifdir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:211
 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:196
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Temporary authentication failure"
 msgstr "Müvəqqəti tanıtma iflası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication required"
 msgstr "Tanıtma lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:289
+#: camel/providers/smtp/camel-smtp-transport.c:305
 #, 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:361
+#: camel/providers/smtp/camel-smtp-transport.c:348
+#, fuzzy, c-format
+msgid "SMTP 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/smtp/camel-smtp-transport.c:388
 #, 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:469
-msgid "No authentication required"
-msgstr "Tanıtma lazım deyildir."
-
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/smtp/camel-smtp-transport.c:411
+#, fuzzy, c-format
 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."
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
 msgstr ""
-"Bu seçənək SMTP vericisi ilə təßdiqlənməyə ehtiyac hiss etmədən "
-"ünsiyyət qurar. Bu da bir çox vericiyə bağlanmaq üçün yaxşı "
-"fikirdir."
+"IMAP vericisinə tanıdılma xətası.\n"
+"%s\n"
+"\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:514
+#: camel/providers/smtp/camel-smtp-transport.c:527
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP vericisi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:516
+#: camel/providers/smtp/camel-smtp-transport.c:529
 #, 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:541
+#: camel/providers/smtp/camel-smtp-transport.c:554
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 "İsmarıc göndrərilə bilmədi: göndərənin ünvanı bildirilməyib."
 
-#: camel/providers/smtp/camel-smtp-transport.c:548
+#: camel/providers/smtp/camel-smtp-transport.c:561
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "İsmarıc göndrərilə bilmədi: göndərənin ünvanı hökmsüzdür."
 
-#: camel/providers/smtp/camel-smtp-transport.c:562
+#: camel/providers/smtp/camel-smtp-transport.c:575
 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:656
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, 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:675
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, 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:710
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:721
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:736
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
+#: camel/providers/smtp/camel-smtp-transport.c:798
 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:805
+#: camel/providers/smtp/camel-smtp-transport.c:824
 #, 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:824
+#: camel/providers/smtp/camel-smtp-transport.c:843
 #, 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:849
+#: camel/providers/smtp/camel-smtp-transport.c:868
 #, 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:868
+#: camel/providers/smtp/camel-smtp-transport.c:887
 #, 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:899
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, 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:918
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, 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:933
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:952
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, 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:994
+#: camel/providers/smtp/camel-smtp-transport.c:1013
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1036
+#: camel/providers/smtp/camel-smtp-transport.c:1055
 #, 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:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1074
 #, 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:87
+#: composer/e-msg-composer-attachment-bar.c:95
 msgid "1 byte"
 msgstr "1 bayt"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:97
 #, c-format
 msgid "%u bytes"
 msgstr "%u bayt"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:112
 #, 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:113
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
 msgid "attachment"
 msgstr "yapışdırılmış fayl"
 
-#: composer/e-msg-composer-attachment-bar.c:413
+#: 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:461
+#: composer/e-msg-composer-attachment-bar.c:469
 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:492
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Add attachment..."
 msgstr "Yapışdırılmış fayl əlavə et ..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:501
 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:1014
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
 msgid "Attachment"
 msgstr "Yapışdırılmış fayl"
 
@@ -4462,52 +4754,52 @@ msgstr "MIME növü:"
 msgid "Send as:"
 msgstr "Fərqli göndər:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:321
 msgid "Click here for the address book"
 msgstr "Ünvan dəftəri üçün buraya tıqla"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:696
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
 msgid "From:"
 msgstr "Göndərən:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:698
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
 msgid "Reply-To:"
 msgstr "Cavab ver"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:618
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
 msgid "Subject:"
 msgstr "Mövzu :"
 
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:700
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
 msgid "To:"
 msgstr "Gn:"
 
-#: composer/e-msg-composer-hdrs.c:377
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Enter the recipients of the message"
 msgstr "İsmarıcın göndərildiği adamlar"
 
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:702
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:381
+#: composer/e-msg-composer-hdrs.c:388
 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:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:392
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4515,7 +4807,7 @@ 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/e-msg-composer.c:518
+#: composer/e-msg-composer.c:528
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4524,26 +4816,32 @@ msgstr ""
 "%s imza faylı açıla bilmədi:\n"
 "%s"
 
-#: composer/e-msg-composer.c:706
+#: composer/e-msg-composer.c:716
 msgid "Save as..."
 msgstr "Fərqli qeyd et ..."
 
-#: composer/e-msg-composer.c:717
+#: composer/e-msg-composer.c:727
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fayl qeyd edərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:737
+#: composer/e-msg-composer.c:747
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fayl yüklərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
+#: composer/e-msg-composer.c:819
+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:824
+#: composer/e-msg-composer.c:883
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4553,29 +4851,29 @@ msgstr ""
 "\n"
 "Dəyişiklikləri qeyd etmak istəyirsinizmi?"
 
-#: composer/e-msg-composer.c:849
+#: composer/e-msg-composer.c:908
 msgid "Open file"
 msgstr "Faylı aç"
 
-#: composer/e-msg-composer.c:975
+#: composer/e-msg-composer.c:1034
 msgid "That file does not exist."
 msgstr "Belə bir fayl yoxdur ."
 
-#: composer/e-msg-composer.c:985
+#: composer/e-msg-composer.c:1044
 msgid "That is not a regular file."
 msgstr "Bu normal bir fayl deyildir ."
 
-#: composer/e-msg-composer.c:995
+#: composer/e-msg-composer.c:1054
 msgid "That file exists but is not readable."
 msgstr "Bu fayl vardır amma oxuna bilən deyildir ."
 
-#: composer/e-msg-composer.c:1005
+#: composer/e-msg-composer.c:1064
 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:1027
+#: composer/e-msg-composer.c:1086
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4583,19 +4881,19 @@ 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:1048
+#: composer/e-msg-composer.c:1107
 msgid "An error occurred while reading the file."
 msgstr "Faylı oxurkən bir xəta oldu ."
 
-#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
+#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
 msgid "Compose a message"
 msgstr "Bir ismarıc yaz"
 
-#: composer/e-msg-composer.c:1765
+#: composer/e-msg-composer.c:1829
 msgid "Could not create composer window."
 msgstr "Dialoq qutusunu yarada bilmədim ."
 
-#: composer/evolution-composer.c:352
+#: composer/evolution-composer.c:355
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -4604,7 +4902,7 @@ msgstr ""
 "parçasındakı\n"
 "heç bir qurǧulari, aparmamısınız."
 
-#: composer/evolution-composer.c:367
+#: composer/evolution-composer.c:370
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolutionun ePoçt yazma parçasını başlada bilmədim ."
 
@@ -4621,74 +4919,74 @@ msgid "calendar information"
 msgstr "təqvim haqqında"
 
 #. 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:69 e-util/e-time-utils.c:117
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
 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:86 e-util/e-time-utils.c:197
+#: 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:89 e-util/e-time-utils.c:200
+#: 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:93 e-util/e-time-utils.c:204
+#: 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:96 e-util/e-time-utils.c:207
+#: 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: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:269
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
 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:274
 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:283
 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:1248
-#: widgets/misc/e-dateedit.c:1307 widgets/misc/e-dateedit.c:1486
+#: 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:314
+#: 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:319 widgets/misc/e-dateedit.c:1251
-#: widgets/misc/e-dateedit.c:1310 widgets/misc/e-dateedit.c:1489
+#: 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:322
+#: e-util/e-time-utils.c:323
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
@@ -4773,7 +5071,7 @@ msgstr "%s i(ı) sonrakı sətirə köçür"
 msgid "Configure %s"
 msgstr "%s i(ı) Quraşdır"
 
-#: executive-summary/component/e-summary.c:918
+#: executive-summary/component/e-summary.c:924
 #, c-format
 msgid ""
 "Cannot open the HTML file:\n"
@@ -4782,7 +5080,7 @@ msgstr ""
 "Html Faylını aça bilmədim:\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:932
+#: executive-summary/component/e-summary.c:938
 #, c-format
 msgid ""
 "Error reading data:\n"
@@ -4791,7 +5089,7 @@ msgstr ""
 " Data oxunarkən xəta oldu:\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:950
+#: executive-summary/component/e-summary.c:956
 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"
 
@@ -4803,7 +5101,7 @@ msgstr "GÖrünüş"
 msgid "Background:"
 msgstr "Arxaplan:"
 
-#: executive-summary/component/main.c:60
+#: 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"
@@ -4838,87 +5136,87 @@ msgstr "Bonobo xidməti"
 msgid "Test service"
 msgstr "Sınaq xidməti"
 
-#: 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
+#: 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:765
+#: executive-summary/test-service/rdf-summary.c:768
 msgid "Update automatically"
 msgstr "Avtomatik güncəllə"
 
-#: executive-summary/test-service/rdf-summary.c:775
+#: executive-summary/test-service/rdf-summary.c:778
 msgid "Update now"
 msgstr "İndi güncəllə"
 
-#: executive-summary/test-service/rdf-summary.c:785
+#: 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:793
-#: filter/filter-datespec.c:67
+#: executive-summary/test-service/rdf-summary.c:796
+#: filter/filter-datespec.c:83
 msgid "minutes"
 msgstr "dəqiqə"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "year"
 msgstr "il"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "years"
 msgstr "il"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "month"
 msgstr "ay"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "months"
 msgstr "ay"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "week"
 msgstr "həftə"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "weeks"
 msgstr "həftə"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:81
 msgid "days"
 msgstr "gün"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hour"
 msgstr "saat"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hours"
 msgstr "saat"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:83
 msgid "minute"
 msgstr "dəqiqə"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "second"
 msgstr "saniyə"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "seconds"
 msgstr "saniyə"
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:199
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Vaxsey. Tarix atmağı unutmusan."
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:201
 msgid "Oops. You have chosen an invalid date."
 msgstr "Vaxsey. Hökmsüz tarixi seçmisən."
 
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:275
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -4928,7 +5226,7 @@ msgstr ""
 "vfolderin açıq qaldığı müddət ilə müqayisə\n"
 "ediləcəkdir."
 
-#: filter/filter-datespec.c:282
+#: filter/filter-datespec.c:298
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -4936,7 +5234,7 @@ msgstr ""
 "Bu ismarıc tarixi burada göstərdiyiniz ilə\n"
 "müqayisə ediləcəkdir."
 
-#: filter/filter-datespec.c:322
+#: filter/filter-datespec.c:338
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -4947,49 +5245,45 @@ msgstr ""
 "\"bir haftə əvval\" məsələn."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "the current time"
 msgstr "indiki vaxt"
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "a time you specify"
 msgstr "bildirdiyin vaxt"
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:374
 msgid "a time relative to the current time"
 msgstr "indiki vaxta görə müddət"
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:432
 msgid "Compare against"
 msgstr "Müqayisə et"
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
 msgid "now"
 msgstr "indi"
 
-#: filter/filter-datespec.c:690
+#: filter/filter-datespec.c:706
 msgid "<click here to select a date>"
 msgstr "<vaxtı görə bilmək üçün buraya tıqlayın>"
 
-#: filter/filter-editor.c:126 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "Süzgəc Qaydaları"
 
 #. and now for the action area
-#: filter/filter-filter.c:424
+#: filter/filter-filter.c:453
 msgid "Then"
 msgstr "Onda"
 
-#: filter/filter-filter.c:437
+#: filter/filter-filter.c:467
 msgid "Add action"
 msgstr "Gediş əlavə et"
 
-#: filter/filter-filter.c:443
-msgid "Remove action"
-msgstr "Gedişi sil"
-
-#: 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."
@@ -4998,19 +5292,20 @@ msgstr ""
 "Lütfən arxaya gedin və məktubların toplanacağı hökmlü bir qovluq "
 "seçin."
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
+#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
+#: mail/mail-account-gui.c:682
 msgid "Select Folder"
 msgstr "Qovluq Seçin"
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:247
 msgid "Enter folder URI"
 msgstr "Qovluq URIsini Bildirin"
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:293
 msgid "<click here to select a folder>"
 msgstr "<qovluq seçmək üçün buraya tıqlayın>"
 
-#: filter/filter-input.c:189
+#: filter/filter-input.c:194
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5019,42 +5314,38 @@ msgstr ""
 "'%s' qaydalı ifadələrdə xəta oldu:\n"
 "%s"
 
-#: filter/filter-part.c:467
+#: filter/filter-part.c:475
 msgid "Test"
 msgstr "Sınaq"
 
-#: filter/filter-rule.c:597
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Qayda adı :"
 
-#: filter/filter-rule.c:601
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "Adsız"
 
-#: filter/filter-rule.c:617
+#: filter/filter-rule.c:646
 msgid "If"
 msgstr "Əgər"
 
-#: filter/filter-rule.c:634
+#: filter/filter-rule.c:664
 msgid "Execute actions"
 msgstr "Gedişi işə sal"
 
-#: filter/filter-rule.c:638
+#: filter/filter-rule.c:668
 msgid "if all criteria are met"
 msgstr "bütün kriteriyalar uyğun gəlirsə"
 
-#: filter/filter-rule.c:643
+#: filter/filter-rule.c:673
 msgid "if any criteria are met"
 msgstr "əgər hər hansı bir kriteriya uyğun gəlirsə"
 
-#: filter/filter-rule.c:654
+#: filter/filter-rule.c:684
 msgid "Add criterion"
 msgstr "Kriteriya əlavə et"
 
-#: filter/filter-rule.c:660
-msgid "Remove criterion"
-msgstr "Kriteriyanı sil"
-
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Süzgəcləri Düzəlt"
@@ -5071,7 +5362,7 @@ msgstr "Gələn"
 msgid "Outgoing"
 msgstr "Gedən"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtual Qovluqlar"
 
@@ -5095,299 +5386,313 @@ msgstr "bütün yerli və fəal uzaq qovluqlarla"
 msgid "with all local folders"
 msgstr "bütün yerli qovluqlarla"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Rəngi Seç"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Qaynağı Seç"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "Yapışdırılmış Fayllar"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "daxil edir"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Qovluğa Köçürt"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Alınma tarixi"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Göndərilmə tarixi"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 #, fuzzy
 msgid "Deleted"
 msgstr "Sil"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "daxil etmir"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "ilə sonlanmır"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "yoxdur"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not sound like"
-msgstr "oxçamır"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not start with"
-msgstr "başlamır"
-
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "Mövcud Deyildir"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 #, fuzzy
 msgid "Draft"
 msgstr "Tarix"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "sonlanır"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr "Mövcuddur"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "mövcuddur"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "İfadə"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Forward to Address"
 msgstr "İsmarıcı ünvana irəlilət"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:15
 msgid "Important"
 msgstr "Vacib"
 
-#: filter/libfilter-i18n.h:26
-msgid "is"
-msgstr "dir(dır)"
-
-#: filter/libfilter-i18n.h:27
-msgid "is greater than"
-msgstr "böyükdür"
-
-#: filter/libfilter-i18n.h:28
-msgid "is less than"
-msgstr "azdır"
-
-#: filter/libfilter-i18n.h:29
-msgid "is not"
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "Is Not"
 msgstr "deyil"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Is"
+msgstr "I"
+
+#: filter/libfilter-i18n.h:18
 msgid "Mailing list"
 msgstr "Məktublaşma qrupu"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:19
 msgid "Message Body"
 msgstr "İsmarıc Gövdəsi"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:20
 msgid "Message Header"
 msgstr "İsmarıc Başlığı"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:21
 msgid "Message was received"
 msgstr "İsmarıc alındı"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:22
 msgid "Message was sent"
 msgstr "İsmarıc göndərildi"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:23
 msgid "Move to Folder"
 msgstr "Qovluğa Köçür"
 
-#: filter/libfilter-i18n.h:36
-msgid "on or after"
-msgstr "da(də) ya da sonra"
-
-#: filter/libfilter-i18n.h:37
-msgid "on or before"
-msgstr "da(də) ya da əvvəl"
-
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:24
 msgid "Read"
 msgstr "Oxu"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:25
 msgid "Recipients"
 msgstr "Alıcılar"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:26
 msgid "Regex Match"
 msgstr "Regex Uyğunluqları"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:27
 msgid "Replied to"
 msgstr "Cavab verilən"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1014
+#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
+#: mail/message-list.c:1052
 msgid "Score"
 msgstr "Xal"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:29
+msgid "Sender"
+msgstr "Göndərən"
+
+#: filter/libfilter-i18n.h:30
 msgid "Set Status"
 msgstr "Hal Seç"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "oxşayır"
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "Source Account"
+msgstr "Hesab"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:32
 msgid "Specific header"
 msgstr "Xas başlıq"
 
-#: filter/libfilter-i18n.h:47
-msgid "starts with"
-msgstr "başlayır"
-
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:34
 msgid "Stop Processing"
 msgstr "İşi Dayandır"
 
-#: filter/libfilter-i18n.h:50 mail/message-list.c:1015
+#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
 msgid "Subject"
 msgstr "Mövzu"
 
+#: filter/libfilter-i18n.h:38
+msgid "contains"
+msgstr "daxil edir"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not contain"
+msgstr "daxil etmir"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not end with"
+msgstr "ilə sonlanmır"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not exist"
+msgstr "yoxdur"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not sound like"
+msgstr "oxçamır"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not start with"
+msgstr "başlamır"
+
+#: filter/libfilter-i18n.h:44
+msgid "ends with"
+msgstr "sonlanır"
+
+#: filter/libfilter-i18n.h:45
+msgid "exists"
+msgstr "mövcuddur"
+
+#: filter/libfilter-i18n.h:46
+msgid "is greater than"
+msgstr "böyükdür"
+
+#: filter/libfilter-i18n.h:47
+msgid "is less than"
+msgstr "azdır"
+
+#: filter/libfilter-i18n.h:48
+msgid "is not"
+msgstr "deyil"
+
+#: filter/libfilter-i18n.h:49
+msgid "is"
+msgstr "dir(dır)"
+
+#: filter/libfilter-i18n.h:50
+msgid "on or after"
+msgstr "da(də) ya da sonra"
+
 #: filter/libfilter-i18n.h:51
+msgid "on or before"
+msgstr "da(də) ya da əvvəl"
+
+#: filter/libfilter-i18n.h:52
+msgid "sounds like"
+msgstr "oxşayır"
+
+#: filter/libfilter-i18n.h:53
+msgid "starts with"
+msgstr "başlayır"
+
+#: filter/libfilter-i18n.h:54
 msgid "was after"
 msgstr "sonra idi"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:55
 msgid "was before"
 msgstr "əvvəl idi"
 
-#: filter/score-editor.c:126
+#: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr "Qiymətləndirmə Qaydaları"
 
-#: mail/component-factory.c:319
+#: mail/component-factory.c:329
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutionun ePoçt parçasını başlada bilmədim ."
 
-#: mail/component-factory.c:392
+#: mail/component-factory.c:402
 msgid "Cannot register storage with shell"
 msgstr "Nüsxəni qabıq ilə qeyd edə bilmədim"
 
-#: mail/folder-browser-factory.c:247
+#: mail/folder-browser-factory.c:209
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\"in Seçənəkləri"
 
-#: mail/folder-browser-factory.c:249 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "Seçənəklər"
 
-#: mail/folder-browser.c:219
+#: mail/folder-browser.c:225
 msgid "Store search as vFolder"
 msgstr "Axtarışı vFolder olaraq saxla"
 
-#: mail/folder-browser.c:510
+#: mail/folder-browser.c:533
 msgid "VFolder on Subject"
 msgstr "Mövzudakı vFolder"
 
-#: mail/folder-browser.c:513
+#: mail/folder-browser.c:536
 msgid "VFolder on Sender"
 msgstr "Göndərəndəki vFolder"
 
-#: mail/folder-browser.c:516
+#: mail/folder-browser.c:539
 msgid "VFolder on Recipients"
 msgstr "Alıcıdakı vFolder"
 
-#: mail/folder-browser.c:519 mail/folder-browser.c:710
+#: mail/folder-browser.c:542 mail/folder-browser.c:733
 msgid "VFolder on Mailing List"
 msgstr "Məktublaşma Qrupundakı VFolder"
 
-#: mail/folder-browser.c:525
+#: mail/folder-browser.c:548
 msgid "Filter on Subject"
 msgstr "Mövzudakı Süzgəc"
 
-#: mail/folder-browser.c:528
+#: mail/folder-browser.c:551
 msgid "Filter on Sender"
 msgstr "Göndərəndəki  Süzgəc"
 
-#: mail/folder-browser.c:531
+#: mail/folder-browser.c:554
 msgid "Filter on Recipients"
 msgstr "Alıcıdakı Süzgəc"
 
-#: mail/folder-browser.c:534 mail/folder-browser.c:709
+#: mail/folder-browser.c:557 mail/folder-browser.c:732
 msgid "Filter on Mailing List"
 msgstr "Məktublaşma Qrupundakı Süzgəc"
 
-#: mail/folder-browser.c:545
+#: mail/folder-browser.c:568
 #, fuzzy
 msgid "Resend"
 msgstr "saniyə"
 
-#: mail/folder-browser.c:547
+#: mail/folder-browser.c:570
 msgid "Save As..."
 msgstr "Fərqli qeyd et ..."
 
-#: 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 "Çap Et"
-
-#: mail/folder-browser.c:554
+#: mail/folder-browser.c:577
 msgid "Reply to Sender"
 msgstr "Göndərənə cavab ver"
 
-#: mail/folder-browser.c:556 mail/mail-view.c:141 ui/evolution-mail.xml.h:35
+#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
 msgid "Reply to All"
 msgstr "Hamısına cavab ver"
 
-#: mail/folder-browser.c:558 mail/mail-view.c:144 ui/evolution-mail.xml.h:14
+#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
 msgid "Forward"
 msgstr "Çatdır"
 
-#: mail/folder-browser.c:560
+#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
 msgid "Forward inline"
 msgstr "Həmən çatdır"
 
-#: mail/folder-browser.c:563
+#: mail/folder-browser.c:586
 msgid "Mark as Read"
 msgstr "Oxunmış olaraq işarətlə"
 
-#: mail/folder-browser.c:565
+#: mail/folder-browser.c:588
 msgid "Mark as Unread"
 msgstr "Oxunmamış olaraq işarətlə"
 
-#: mail/folder-browser.c:570
+#: mail/folder-browser.c:593
 msgid "Move to Folder..."
 msgstr "Qovluğa Daşı..."
 
-#: mail/folder-browser.c:572
+#: mail/folder-browser.c:595
 msgid "Copy to Folder..."
 msgstr "Qovluğa Köçür..."
 
-#: mail/folder-browser.c:576
+#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
 msgid "Undelete"
 msgstr "Geri Qaytar"
 
@@ -5395,20 +5700,20 @@ msgstr "Geri Qaytar"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:586
+#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
 msgid "Apply Filters"
 msgstr "Süzgəclər Əlavə Et"
 
-#: mail/folder-browser.c:590
+#: mail/folder-browser.c:613
 msgid "Create Rule From Message"
 msgstr "İsmarıcdan Qayda Yarat"
 
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:735
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Məktublaşma Qrupunda Süz (%s)"
 
-#: mail/folder-browser.c:713
+#: mail/folder-browser.c:736
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "(%s) Məktublaşma Qrupundakı VFolder"
@@ -5479,65 +5784,66 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-accounts.c:116
+#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
 msgid " (default)"
 msgstr " (varsayılan) "
 
-#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#: mail/mail-accounts.c:197
+#, fuzzy
+msgid "Disable"
+msgstr "Bağla."
+
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+msgid "Enable"
+msgstr ""
+
+#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
 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:334 mail/mail-accounts.c:338
+#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
 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:452
+#: mail/mail-accounts.c:536
 msgid "Evolution Account Manager"
 msgstr "Evolution Hesab İdarəcisi"
 
-#: mail/mail-account-editor.c:301
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
+#: mail/mail-account-editor.c:105
+msgid "You have not filled in all of the required information."
 msgstr ""
-"Bir və ya daha çox xidmət düzgün quraşdırılmayıb.\n"
-"Yenə də qeyd etmək istəyisinizmi?"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:720
+#: mail/mail-account-editor.c:173
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesab Düzəldicisi"
 
-#: mail/mail-account-editor.c:741
-msgid "Unspecified"
-msgstr "Bildirilməmiş"
-
-#: mail/mail-autofilter.c:71
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "%s a(ə) məktub göndər"
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, c-format
 msgid "Subject is %s"
 msgstr "Mövzu %s dir(dır)"
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr "Məktub %s dandır(dəndir)"
 
-#: mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr "%s məktublaşma qrupu"
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
 msgid "Add Filter Rule"
 msgstr "Süzgəc Qaydası Əlavə Et"
 
-#: mail/mail-callbacks.c:85
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5549,7 +5855,7 @@ msgstr ""
 "bunu quraşdırmalısınız.\n"
 "Bunu indi quraşdırmaq istəyirsinizmi?"
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5557,7 +5863,7 @@ msgstr ""
 "ePoçt göndərməkdən əvvəl bir \n"
 "şəxs tanıtmalısan."
 
-#: mail/mail-callbacks.c:150
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5565,11 +5871,11 @@ msgstr ""
 "ePoçt göndərməkdən əvvəl bir ePoçt\n"
 "nəqliyyatını qurmalısan."
 
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:202
 msgid "You have not set a mail transport method"
 msgstr "Məktub nəql yolunu bildirməmisən"
 
-#: mail/mail-callbacks.c:227
+#: mail/mail-callbacks.c:235
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5577,34 +5883,34 @@ msgstr ""
 "Bu ismarıcın mövzusu yoxdur .\n"
 "Həqiqətən də göndərim?"
 
-#: mail/mail-callbacks.c:296
+#: mail/mail-callbacks.c:308
+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:351
 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:318
-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:583
+#: mail/mail-callbacks.c:591
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "%s da(də) %s yazmışdır:\n"
 
-#: mail/mail-callbacks.c:765
+#: mail/mail-callbacks.c:773
 msgid "Forwarded message:\n"
 msgstr "Bu ismarıcı çatdır:\n"
 
-#: mail/mail-callbacks.c:868
+#: mail/mail-callbacks.c:876
 msgid "Move message(s) to"
 msgstr "İsmarıc(ları) buraya daşı "
 
-#: mail/mail-callbacks.c:870
+#: mail/mail-callbacks.c:878
 msgid "Copy message(s) to"
 msgstr "İsmarıc(ları) buraya köçürt"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:1019
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5612,7 +5918,7 @@ msgstr ""
 "Siz sadəcə olaraq Vəzifələr qovluğundakı\n"
 "ismarıcları düzəldə bilərsiniz."
 
-#: mail/mail-callbacks.c:1048
+#: mail/mail-callbacks.c:1056
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -5621,11 +5927,11 @@ msgstr ""
 "Siz sadəcə olaraq Vəzifələr qovluğundakı\n"
 "ismarıcları düzəldə bilərsiniz."
 
-#: mail/mail-callbacks.c:1081 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
 msgid "Overwrite file?"
 msgstr "Faylının üsütünə yazım mı?"
 
-#: mail/mail-callbacks.c:1085 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5633,15 +5939,15 @@ msgstr ""
 "Eyni adlı bir fayl onsuz da vardır.\n"
 "Üstünə yazım mı?"
 
-#: mail/mail-callbacks.c:1129
+#: mail/mail-callbacks.c:1137
 msgid "Save Message As..."
 msgstr "İsmarıcı Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:1131
+#: mail/mail-callbacks.c:1139
 msgid "Save Messages As..."
 msgstr "İsmarıcları Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:1245
+#: mail/mail-callbacks.c:1253
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5650,52 +5956,61 @@ msgstr ""
 "Süzgəc mə'lumatını yükləmə xətası:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1294
+#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
 msgid "Print Message"
 msgstr "İsmarıcı Çap Et"
 
-#: mail/mail-callbacks.c:1341
+#: mail/mail-callbacks.c:1349
 msgid "Printing of message failed"
 msgstr "İsmarıların çap edilməsi bacarılmadı"
 
+#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#, fuzzy
+msgid "Connecting to server..."
+msgstr "Vericiyə bağlanılır"
+
 #: mail/mail-config.glade.h:1
 #, fuzzy
+msgid " Check for supported types "
+msgstr "Dəstəklənən növləri sına..."
+
+#: mail/mail-config.glade.h:2
+#, fuzzy
 msgid " color"
 msgstr "Rənglər"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "Hesab"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "Hesab Haqqında"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "Hesab İdarəsi"
 
 #: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "Ətraflı"
+#, fuzzy
+msgid "Accounts"
+msgstr "Hesab"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Authentication"
 msgstr "Tanıtma"
 
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
+#: mail/mail-config.glade.h:9
+#, fuzzy
+msgid "Authentication Type: "
 msgstr "Tanıtma Növü:"
 
 #: mail/mail-config.glade.h:10
-msgid "Automatically check mail every"
+#, fuzzy
+msgid "Automatically check for new mail every"
 msgstr "Məktubları bu müddətdə bir avtomatik olaraq yoxla: "
 
 #: mail/mail-config.glade.h:12
-msgid "Check settings"
-msgstr "Qurğuları Sına"
-
-#: mail/mail-config.glade.h:13
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5711,203 +6026,179 @@ msgstr ""
 "\n"
 "Qurğularınızı qeyd etmək üçün \"Qurtar\"a basın."
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:18
 msgid "De_fault"
 msgstr "Ə_sas"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:20
 msgid "Done"
 msgstr "Qurtardı"
 
+#: mail/mail-config.glade.h:21
+#, fuzzy
+msgid "Drafts"
+msgstr "Tarix"
+
+#: mail/mail-config.glade.h:22
+#, fuzzy
+msgid "Drafts folder:"
+msgstr "Yeni bir qovluq yarat"
+
 #: mail/mail-config.glade.h:24
 msgid "Email Address:"
 msgstr "ePoçt Ünvanı: "
 
-#: mail/mail-config.glade.h:25
-msgid "Email address:"
-msgstr "ePoçt ünvanı : "
-
 #: mail/mail-config.glade.h:26
-msgid "Evolution Mail Configuration"
-msgstr "Evolution ePoçt Quraşdırılması"
-
-#: mail/mail-config.glade.h:27
 msgid "Full Name:"
 msgstr "Tam Ad:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 msgid "Highlight citations with "
 msgstr ""
 
-#: mail/mail-config.glade.h:31
-msgid "Hostname:"
-msgstr "Verici Adı:"
-
-#: mail/mail-config.glade.h:32
-msgid "IMAP"
-msgstr "IMAP"
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "IMAPv4 "
+msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:30
 msgid "Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:34
-msgid "Include this account when receiving mail"
-msgstr "Məktub alındığında bu hesabı daxil et"
-
-#: mail/mail-config.glade.h:35
-msgid "Keep mail on server"
-msgstr "Məktubu vericidə saxla"
-
-#: mail/mail-config.glade.h:36
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:37
-msgid "Mail"
-msgstr "Məktub"
-
-#: mail/mail-config.glade.h:38
-msgid "Mail Account"
-msgstr "ePoçt Hesabı"
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Kerberos "
+msgstr "Kerberos 4"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:32
 msgid "Mail Configuration"
 msgstr "ePoçt Quraşdırılması"
 
-#: mail/mail-config.glade.h:40
-msgid "Mail Configuration Druid"
-msgstr "ePoçt Quraşdırılması Vasitəsi"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:33
 msgid "Make this my default account"
 msgstr "Bunu əsas hesab olaraq göstər"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:34
 msgid "Mark messages as \"Read\" after:"
 msgstr "İsmarıcları bundan sonra \"Oxundu\" olaraq işarətlə: "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:36
 msgid "News"
 msgstr "Xəbərlər"
 
-#: mail/mail-config.glade.h:46
-msgid "Optional"
-msgstr "Arzuya Görə"
+#: mail/mail-config.glade.h:38
+#, fuzzy
+msgid "Optional Information"
+msgstr "Mə'lumat Yoxdur"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:39
 msgid "Organization:"
 msgstr "Orqanizasiya"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:41
 msgid "PGP binary path:"
 msgstr "PGP binarı cığırı:"
 
-#: mail/mail-config.glade.h:50
-msgid "Password:"
-msgstr "Parol:"
-
-#: mail/mail-config.glade.h:53
-msgid "Plain Text"
-msgstr "Düz Mətn"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Qmail maildir "
+msgstr "məktub qovluğu"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:47
 msgid "Receiving Email"
 msgstr "ePoçt Alınır"
 
-#: mail/mail-config.glade.h:55
-msgid "Remember my password"
-msgstr "Mənim parolumu yadda saxla"
-
-#: mail/mail-config.glade.h:56
-msgid "Reply address:"
-msgstr "Cavab ünvanı:"
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "ePoçt Alınır"
 
-#: mail/mail-config.glade.h:57
-msgid "Required"
-msgstr "Lazımi"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Receiving Options"
+msgstr "Alınır"
 
-#: mail/mail-config.glade.h:59
-msgid "Save password"
-msgstr "Parolu Qeyd Et"
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Required Information"
+msgstr "İstifadəçi Haqqında"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:53
 msgid "Select PGP binary"
 msgstr "PGP binarını seç"
 
-#: mail/mail-config.glade.h:61
-msgid "Select signature file"
-msgstr "Imza faylını seç"
-
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:54
 msgid "Send mail in HTML format by default."
 msgstr "Əsas olaraq ePoçtu HTML Şəklində göndər"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:55
 msgid "Sending Email"
 msgstr "ePoçt Göndərilir"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Sending Mail"
+msgstr "ePoçt Göndərilir"
+
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Sent"
+msgstr "Görülmüş"
+
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Sent and Draft Messages"
+msgstr "Təqvim İsmarıcı"
+
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Sent messages folder:"
+msgstr "İsmarıclar qovluğa qeyd edilir"
+
+#: mail/mail-config.glade.h:61
 msgid "Server Configuration"
 msgstr "Verici Quraşdırılması"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:62
 msgid "Server Type: "
 msgstr "Verici Növü: "
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:63
 msgid "Server requires authentication"
 msgstr "Verici tanıtmaya ehtiyac hiss edər"
 
-#: mail/mail-config.glade.h:68
-msgid "Server type:"
-msgstr "Verici növü:"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:64
 msgid "Signature file:"
 msgstr "Imza faylı : "
 
-#: mail/mail-config.glade.h:70
-msgid "Signature:"
-msgstr "Imza:"
-
-#: mail/mail-config.glade.h:71
-msgid "Source"
-msgstr "Qaynaq"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:65
 msgid "Sources"
 msgstr "Qaynaqlar"
 
-#: mail/mail-config.glade.h:73
-msgid "Transport"
-msgstr "Nəqliyyat"
+#: mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Special Folders"
+msgstr "Virtual Qovluqlar"
 
-#: mail/mail-config.glade.h:74
-msgid "Transport Authentication"
-msgstr "Nəqliyyat Tanıdılması"
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Standard Unix mbox"
+msgstr "Standart UNIX məktub qutusu faylı"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:68
 msgid "Type"
 msgstr "Növ"
 
-#: 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 ""
-"Bu vericiləri izah edən sözləri yazın. Məsələn: \n"
-"\"İs Yeri\" və ya \"Ev\"."
-
-#: mail/mail-config.glade.h:77
-msgid "User Information"
-msgstr "İstifadəçi Haqqında"
+#: mail/mail-config.glade.h:69
+#, fuzzy
+msgid "Use secure connection (SSL)"
+msgstr "Bu verici (SSL) tanıdılmasına ehtiyac hiss edər"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:70
 msgid "Username:"
 msgstr "İstifadəçi adı :"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:71
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -5917,177 +6208,200 @@ msgstr ""
 "\n"
 "Başlamaq üçün \"Sonrakı\" düyməsinə basın. "
 
-#: mail/mail-config.glade.h:84 ui/evolution-event-editor.xml.h:58
+#: 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 "_Düzəlt"
 
-#: mail/mail-config.glade.h:85
-msgid "minutes."
-msgstr "dəqiqə."
+#: 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:421
-#, c-format
+#: mail/mail-config-druid.c:101
 msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+"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 ""
-"Gələn məktubun quruluşu başa düşülmədi.\n"
-"%s dan(dən) məktub alınmasında problem yaşaya biləsiniz"
 
-#: mail/mail-config-druid.c:515
-msgid "Namespace:"
-msgstr "Ad sahəsi:"
+#: 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:708
-#, c-format
+#: mail/mail-config-druid.c:107
 msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+"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 ""
-"Gedən məktub qurğuları başa düşülmədi.\n"
-"%s a(ə) məktub göndərilməsində problem yaşaya biləsiniz"
 
 #. set window title
-#: mail/mail-config-druid.c:1215
+#: mail/mail-config-druid.c:445
 msgid "Evolution Account Wizard"
 msgstr "Evolution Hesab Sehirbazı"
 
-#: mail/mail-display.c:189
+#: mail/mail-display.c:194
 msgid "Save Attachment"
 msgstr "Yapışdırılmış Faylı Qeyd Et"
 
-#: mail/mail-display.c:229
+#: 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:290
+#: mail/mail-display.c:295
 msgid "Save to Disk..."
 msgstr "Diskə Qeyd Et ..."
 
-#: mail/mail-display.c:292
+#: mail/mail-display.c:297
 #, c-format
 msgid "Open in %s..."
 msgstr "%s da(də) Aç ..."
 
-#: mail/mail-display.c:294
+#: mail/mail-display.c:299
 msgid "View Inline"
 msgstr "İçərisini Göstər"
 
-#: mail/mail-display.c:323
+#: mail/mail-display.c:334
 msgid "External Viewer"
 msgstr "Xarici Göstərici"
 
-#: mail/mail-display.c:346
+#: mail/mail-display.c:357
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "İçərisini Göstər (%s ilə)"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:361
 msgid "Hide"
 msgstr "Gizlət"
 
-#: mail/mail-format.c:506
+#: mail/mail-display.c:1102
+msgid "Open link in browser"
+msgstr ""
+
+#: mail/mail-display.c:1104
+#, fuzzy
+msgid "Save as (FIXME)"
+msgstr "_Vəzifə"
+
+#: mail/mail-display.c:1106
+#, fuzzy
+msgid "Copy location (FIXME)"
+msgstr "_Əlaqələr"
+
+#: mail/mail-format.c:518
 #, c-format
 msgid "%s attachment"
 msgstr "%s yapışdırılmış fayl"
 
-#: mail/mail-format.c:723
+#: mail/mail-format.c:560
+#, fuzzy
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Qovluq açıla bilmir: ismarıc siyahısı bütün deyil."
+
+#: mail/mail-format.c:742
 msgid "Loading message content"
 msgstr "İsmarıc içindəkilər yüklənir"
 
-#: mail/mail-format.c:1012
+#: mail/mail-format.c:1046
 msgid "Encrypted message not displayed"
 msgstr "Kodlanmış ismarıc göstərilmədi"
 
-#: mail/mail-format.c:1018
+#: mail/mail-format.c:1052
 msgid "Encrypted message"
 msgstr "Kodlanmış İsmarıc"
 
-#: mail/mail-format.c:1019
+#: mail/mail-format.c:1053
 msgid "Click icon to decrypt."
 msgstr "Kodu açmaq üçün timsala basın."
 
-#: mail/mail-format.c:1088 mail/mail-format.c:1475
+#: mail/mail-format.c:1137 mail/mail-format.c:1526
 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:1096 mail/mail-format.c:1483
+#: mail/mail-format.c:1145 mail/mail-format.c:1534
 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:1696
+#: mail/mail-format.c:1747
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP saytını göstərən ox (%s)"
 
-#: mail/mail-format.c:1708
+#: mail/mail-format.c:1759
 #, 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:1712
+#: mail/mail-format.c:1763
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerli faylyi göstərən ox (%s)"
 
-#: mail/mail-format.c:1746
+#: mail/mail-format.c:1797
 #, 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:1751
+#: mail/mail-format.c:1802
 msgid "Malformed external-body part."
 msgstr "Xəsərli xarici proqram parçası."
 
-#: mail/mail-local.c:335
+#: mail/mail-local.c:337
 #, c-format
 msgid "No such folder %s"
 msgstr "%s deyə bir qovluq yoxdur"
 
-#: mail/mail-local.c:508
+#: mail/mail-local.c:509
 #, c-format
 msgid "Opening '%s'"
 msgstr "'%s' Açılır"
 
-#: mail/mail-local.c:786
+#: mail/mail-local.c:787
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" qovluğu \"%s\" şəklinə çevrilir"
 
-#: mail/mail-local.c:790
+#: 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
+#: mail/mail-local.c:815
 msgid "Reconfiguring folder"
 msgstr "Qovluq yenidən qurulur"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:843
+#: mail/mail-local.c:844
 msgid "Closing current folder"
 msgstr "Hazırkı qovluq qapadılır"
 
-#: mail/mail-local.c:875
+#: mail/mail-local.c:876
 msgid "Renaming old folder and opening"
 msgstr "Köhnə qovluğun adı dəyişdirilir və açılır"
 
-#: mail/mail-local.c:893
+#: mail/mail-local.c:894
 msgid "Creating new folder"
 msgstr "Yeni bir qovluq yarat"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:908
 msgid "Copying messages"
 msgstr "İsmarıclar köçürülür"
 
-#: mail/mail-local.c:928
+#: mail/mail-local.c:925
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6096,7 +6410,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:967
+#: mail/mail-local.c:964
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6104,7 +6418,7 @@ msgstr ""
 "Bu qovluğu bir də aça bilməsən, onu əllə\n"
 "bərpa etməlisən."
 
-#: mail/mail-mt.c:181
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6113,7 +6427,7 @@ msgstr ""
 "'%s' sırasında xəta:\n"
 "%s"
 
-#: mail/mail-mt.c:183
+#: mail/mail-mt.c:192
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6122,96 +6436,105 @@ msgstr ""
 "Əməliyyat aparılırkən xəta oldu:\n"
 "%s"
 
-#: mail/mail-mt.c:506 mail/mail-mt.c:535 mail/mail-mt.c:882
+#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
 msgid "Working"
 msgstr "İşləyir"
 
-#: mail/mail-mt.c:670 mail/session.c:91
+#: mail/mail-mt.c:679 mail/session.c:98
 msgid "Do you accept?"
 msgstr "Qəbul edirsiniz?"
 
-#: mail/mail-mt.c:864
+#: mail/mail-mt.c:873
 msgid "Evolution progress"
 msgstr "\"Evolution\"un gedişi"
 
-#: mail/mail-ops.c:518
+#: mail/mail-ops.c:587
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" Göndərilir"
 
-#: mail/mail-ops.c:520
+#: mail/mail-ops.c:589
 msgid "Sending message"
 msgstr "İsmarıc göndərilir"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:704
+#, fuzzy, c-format
+msgid "Sending message %d of %d"
+msgstr "%d nin(nın) %d ismarıcı yazılır"
+
+#: mail/mail-ops.c:723
+#, fuzzy, c-format
+msgid "Failed on message %d of %d"
+msgstr "%d nin(nın) %d ismarıcı yazılır"
+
+#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+msgid "Complete."
+msgstr "Qurtadı."
+
+#: mail/mail-ops.c:811
 msgid "Saving message to folder"
 msgstr "İsmarıclar qovluğa qeyd edilir"
 
-#: mail/mail-ops.c:824
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İsmarıclar \"%s\"a(ə) daşınır"
 
-#: mail/mail-ops.c:824
+#: 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:841
+#: mail/mail-ops.c:900
 msgid "Moving"
 msgstr "Daşınır"
 
-#: mail/mail-ops.c:844
+#: mail/mail-ops.c:903
 msgid "Copying"
 msgstr "Köçürdülür"
 
-#: mail/mail-ops.c:855
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s message %d of %d (uid \"%s\")"
-
-#: mail/mail-ops.c:926
+#: mail/mail-ops.c:978
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" dakı qovluqlar daranır"
 
-#: mail/mail-ops.c:1084
+#: mail/mail-ops.c:1139
 msgid "Forwarded messages"
 msgstr "Çatdırılmış ismarıc"
 
-#: mail/mail-ops.c:1125 mail/mail-ops.c:1263
+#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-ops.c:1192
+#: mail/mail-ops.c:1247
 #, c-format
 msgid "Opening store %s"
 msgstr "%s qaynağı açılır"
 
-#: mail/mail-ops.c:1379
+#: mail/mail-ops.c:1434
 msgid "Expunging folder"
 msgstr "Qovluq açılır"
 
-#: mail/mail-ops.c:1428
+#: mail/mail-ops.c:1483
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s ismarıcı alınır"
 
-#: mail/mail-ops.c:1495
+#: mail/mail-ops.c:1550
 msgid "Retrieving messages"
 msgstr "İsmarıclar alınır"
 
-#: mail/mail-ops.c:1505
+#: mail/mail-ops.c:1560
 #, 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:1579
+#: mail/mail-ops.c:1634
 msgid "Saving messages"
 msgstr "İsmarıclar qeyd edilir"
 
-#: mail/mail-ops.c:1658
+#: mail/mail-ops.c:1713
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6220,12 +6543,12 @@ msgstr ""
 "Nəticə faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1671
+#: mail/mail-ops.c:1726
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "%d nin %d ismarıcı qeyd edilir (uid \"%s\")"
 
-#: mail/mail-ops.c:1685
+#: mail/mail-ops.c:1740
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6234,11 +6557,11 @@ msgstr ""
 "İsmarıcların buraya qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1759
+#: mail/mail-ops.c:1814
 msgid "Saving attachment"
 msgstr "Yapışdırılmış Fayl Qeyd Edilir"
 
-#: mail/mail-ops.c:1774
+#: mail/mail-ops.c:1829
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6247,75 +6570,71 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1802
+#: mail/mail-ops.c:1857
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Data yazıla bilmədi: %s"
 
-#: mail/mail-search-dialogue.c:107
+#: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "A_xtar"
 
-#: mail/mail-send-recv.c:136
+#: mail/mail-send-recv.c:138
 msgid "Cancelling ..."
 msgstr "Ləğv Edilir ..."
 
-#: mail/mail-send-recv.c:231
+#: mail/mail-send-recv.c:233
 msgid "Send & Receive mail"
 msgstr "ePoçt Göndər və Al"
 
-#: mail/mail-send-recv.c:234
+#: mail/mail-send-recv.c:236
 msgid "Receiving"
 msgstr "Alınır"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:285
 msgid "Updating ..."
 msgstr "Güncəllənir ..."
 
-#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
 msgid "Waiting ..."
 msgstr "Gözlənilir ..."
 
-#: mail/mail-send-recv.c:304
+#: mail/mail-send-recv.c:306
 msgid "Sending"
 msgstr "Göndərilir"
 
-#: mail/mail-send-recv.c:469
+#: mail/mail-send-recv.c:471
 msgid "Cancelled."
 msgstr "Ləğv Edildi."
 
-#: mail/mail-send-recv.c:473
-msgid "Complete."
-msgstr "Qurtadı."
-
-#: mail/mail-summary.c:111
+#: mail/mail-summary.c:109
 msgid "Incomplete message written on pipe!"
 msgstr "Borulamadan xəsərli bir ismarıc gəldi !"
 
-#: mail/mail-tools.c:138
+#: mail/mail-tools.c:141
 #, 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:185
+#: mail/mail-tools.c:188
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (çatdırilmiş ismarıc)"
 
-#: mail/mail-tools.c:195
+#: mail/mail-tools.c:198
 msgid "Fwd: (no subject)"
 msgstr "Dvm: (mövzusuz)"
 
-#: mail/mail-tools.c:212
+#: mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Çatdırılmış ismarıc - %s"
 
-#: mail/mail-tools.c:214
+#: mail/mail-tools.c:217
 msgid "Forwarded message (no subject)"
 msgstr "Çatdırılmış ismarıc (mövzusuz)"
 
-#: mail/mail-tools.c:411
+#: mail/mail-tools.c:414
 #, c-format
 msgid ""
 "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
@@ -6324,190 +6643,161 @@ 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-vfolder.c:248
+#: mail/mail-vfolder.c:249
 msgid "VFolders"
 msgstr "VFolderlər"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:427
 msgid "New VFolder"
 msgstr "Yeni VFolder"
 
 #. 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
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
 msgid "Reply"
 msgstr "Cavab ver"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
 msgid "Reply to the sender of this message"
 msgstr "İsmarıcı göndərene cavab ver"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
 msgid "Reply to all recipients of this message"
 msgstr "İsmarıcın bütün alıcılarına cavab ver"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:16
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
 msgid "Forward this message"
 msgstr "Bu ismarıcı çatdır"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:31
+#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
 msgid "Print the selected message"
 msgstr "Seçili ismarıcı çap et"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Bu ismarıcı sil"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:648
 msgid "Unseen"
 msgstr "Görülməmiş"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:649
 msgid "Seen"
 msgstr "Görülmüş"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:650
 msgid "Answered"
 msgstr "Cavab cerilmiş"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:651
 msgid "Multiple Unseen Messages"
 msgstr "Çoxlu Görülməmiş İsmarıc"
 
-#: mail/message-list.c:618
+#: mail/message-list.c:652
 msgid "Multiple Messages"
 msgstr "Çoxlu İsmarıc"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:656
 #, fuzzy
 msgid "Lowest"
 msgstr "Alçaq"
 
-#: mail/message-list.c:623
+#: mail/message-list.c:657
 #, fuzzy
 msgid "Lower"
 msgstr "Alçaq"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:661
 #, fuzzy
 msgid "Higher"
 msgstr "Yüksək"
 
-#: mail/message-list.c:628
+#: mail/message-list.c:662
 #, fuzzy
 msgid "Highest"
 msgstr "Yüksək"
 
-#: mail/message-list.c:878
+#: mail/message-list.c:912
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:885
+#: mail/message-list.c:919
 msgid "Today %l:%M %p"
 msgstr "Bugün %l:%M %p"
 
-#: mail/message-list.c:894
+#: mail/message-list.c:928
 msgid "Yesterday %l:%M %p"
 msgstr "Sabah: %l:%M %p"
 
-#: mail/message-list.c:906
+#: mail/message-list.c:940
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:948
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:950
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1014
+#: mail/message-list.c:1052
 msgid "Flagged"
 msgstr "Bayraqlı"
 
-#: mail/message-list.c:1015
+#: mail/message-list.c:1053
 msgid "From"
 msgstr "Göndərən"
 
-#: mail/message-list.c:1015
+#: mail/message-list.c:1053
 msgid "Date"
 msgstr "Tarix"
 
-#: mail/message-list.c:1015
+#: mail/message-list.c:1053
 msgid "Received"
 msgstr "Alındı"
 
-#: mail/message-list.c:1016
+#: mail/message-list.c:1054
 msgid "To"
 msgstr "Gn:"
 
-#: mail/message-list.c:1016
+#: mail/message-list.c:1054
 msgid "Size"
 msgstr "Böyüklük"
 
-#: mail/openpgp-utils.c:89
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "%s üçün %s parol kalimanizi lürfən girin"
-
-#: mail/openpgp-utils.c:92
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Lütfən %s parol kəlimənizi girin"
-
-#: 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 "Heç bir GPG/PGP proqramı yoxdur"
-
-#: 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 "Parol verilməyib."
-
-#: 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"
-msgstr "GPG/PGP proqramına boru yaradıla bilmir. %s"
-
-#: mail/openpgp-utils.c:588
-msgid "No recipients specified"
-msgstr "Alıcı bildirilməyib"
-
-#: mail/openpgp-utils.c:1088
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Müvəqqəti fayl yaradıla bilmir: %s"
-
-#: mail/subscribe-dialog.c:73 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
 msgid "Folder"
 msgstr "Qovluq"
 
-#: mail/subscribe-dialog.c:74
+#: mail/subscribe-dialog.c:77
 msgid "Store"
 msgstr "Saxla"
 
-#: mail/subscribe-dialog.c:156
+#: mail/subscribe-dialog.c:138
 msgid "Display folders starting with:"
 msgstr "Bunula başlayan qovluqları göstər:"
 
-#: mail/subscribe-dialog.c:186
+#: mail/subscribe-dialog.c:168
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr "\"%s\" üçün saxlama aməliyyatı aparılır"
 
-#: mail/subscribe-dialog.c:289
+#: mail/subscribe-dialog.c:271
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "\"%s\" qovluğuna qeydiyyat aparılır"
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:273
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" qovluğuna qeydiyyat silinir"
 
+#. Construct the app
+#: mail/subscribe-dialog.c:873
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Al_t Qeydləri İdarə Et..."
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Qovluq adı:"
@@ -6520,9 +6810,23 @@ msgstr "Qovluq növü:"
 msgid "Specify where to create the folder:"
 msgstr "Qovluğun yaradılacağı yeri göstərin:"
 
+#: 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:157
+#: shell/importer/importer.c:182
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6533,7 +6837,7 @@ msgstr ""
 "Alıcı hazır deyil.\n"
 "Yenidən sınamaq üçün 5 saniyə gözlənir."
 
-#: shell/importer/importer.c:175 shell/importer/importer.c:202
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6542,7 +6846,7 @@ msgstr ""
 "%s Alınır\n"
 "%d üzvü alınır."
 
-#: shell/importer/importer.c:309
+#: shell/importer/importer.c:341
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -6551,11 +6855,11 @@ msgstr ""
 "İş görəcək alıcı mövcud deyildir\n"
 "%s"
 
-#: shell/importer/importer.c:319
+#: shell/importer/importer.c:351
 msgid "Importing"
 msgstr "Alınır"
 
-#: shell/importer/importer.c:327
+#: shell/importer/importer.c:359
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -6564,12 +6868,17 @@ msgstr ""
 "%s Alınır.\n"
 "%s Başladılır"
 
-#: shell/importer/importer.c:342
+#: shell/importer/importer.c:372
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "%s yüklənə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:357
+#: shell/importer/importer.c:402
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6578,40 +6887,26 @@ msgstr ""
 "%s Alınır\n"
 "Alınan üzv 1."
 
-#: shell/importer/importer.c:428
+#: shell/importer/importer.c:473
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: shell/importer/importer.c:478
+#: shell/importer/importer.c:523
 msgid "Filename:"
 msgstr "Fayl adı:"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
 msgid "Select a file"
 msgstr "Fayl seç"
 
-#: shell/importer/importer.c:493
+#: shell/importer/importer.c:538
 msgid "File type:"
 msgstr "Fayl növü:"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
 msgid "Import"
 msgstr "Al"
 
-#: 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."
-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/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -6636,11 +6931,11 @@ msgstr ""
 "Bu vasitə ila xarici faylları \"Evolution\" içinə\n"
 "alacaqsınız."
 
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: shell/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr "Evolution qurulması"
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:122
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6648,30 +6943,30 @@ msgstr ""
 "Evolutionun bu yeni qurulmasının şəxsi Evolution qovluğuna\n"
 "bə'zi əlavə fayllar köçürməlidir"
 
-#: shell/e-setup.c:117
+#: shell/e-setup.c:123
 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:157
+#: shell/e-setup.c:163
 msgid "Could not update files correctly"
 msgstr "Fayllar düzgün güncəllənə bilmədi"
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
+#: 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:189
+#: shell/e-setup.c:195
 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:190
+#: shell/e-setup.c:196
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "\"Oldu\"'ya tıqlayıb, \"Evolution\" istifadəçi fayllarını buraya qur"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:215
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6682,7 +6977,7 @@ msgstr ""
 "\n"
 "Xəta : %s"
 
-#: shell/e-setup.c:224
+#: shell/e-setup.c:230
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -6691,7 +6986,7 @@ msgstr ""
 "Faylları `%s''yə\n"
 "köçürdə bilmədim ."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:255
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6702,7 +6997,7 @@ msgstr ""
 "\"Evolution\" istifadəçi fayllarınin qurulması\n"
 "üçün onu sil."
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:267
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6713,7 +7008,7 @@ msgstr ""
 "\"Evolution\" qovluğunda yerləşmir. \"Evolution\" \n"
 "istifadəçi fayllarınin qurulması üçün onu sil."
 
-#: shell/e-shell-folder-creation-dialog.c:96
+#: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -6722,11 +7017,11 @@ msgstr ""
 "Bildirilən qovluq yaradıla bilmədi:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:153
+#: shell/e-shell-folder-creation-dialog.c:156
 msgid "The specified folder name is not valid."
 msgstr "Bildirilən qovluq adı hökmlü deyildir ."
 
-#: shell/e-shell-folder-creation-dialog.c:245
+#: shell/e-shell-folder-creation-dialog.c:248
 msgid "Evolution - Create new folder"
 msgstr "\"Evolution\" - Yeni qovluq yarat"
 
@@ -6738,27 +7033,27 @@ msgstr ""
 "Bildirilən gediş üçün bu seçili qovluq növü \n"
 "hökmlü deyildir ."
 
-#: shell/e-shell-folder-selection-dialog.c:318
+#: shell/e-shell-folder-selection-dialog.c:319
 msgid "New..."
 msgstr "Yeni ..."
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
 msgid "(Untitled)"
 msgstr "( Adsız )"
 
-#: shell/e-shell-view-menu.c:159
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy $PATH yolunda tapıla bilmədi."
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:179
 msgid "Bug buddy could not be run."
 msgstr "\"Bug-buddy\" işə salına bilmədi."
 
-#: shell/e-shell-view-menu.c:194
+#: shell/e-shell-view-menu.c:208
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Təlif haqqı 1999, 2000, 2001 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:196
+#: shell/e-shell-view-menu.c:210
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6767,34 +7062,30 @@ 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:360
+#: shell/e-shell-view-menu.c:374
 msgid "Go to folder..."
 msgstr "Qovluğa get ..."
 
-#: shell/e-shell-view.c:143
+#: shell/e-shell-view.c:148
 msgid "(No folder displayed)"
 msgstr "( Heç bir qovluq göstərilmir )"
 
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Qovluqlar"
-
-#: shell/e-shell-view.c:1124
+#: shell/e-shell-view.c:1134
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1126
+#: shell/e-shell-view.c:1136
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell.c:372
+#: shell/e-shell.c:378
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Yerli qeydi quraşdıra bilmədim -- %s"
 
-#: shell/e-shell.c:1242
+#: shell/e-shell.c:1248
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6803,15 +7094,15 @@ 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:123
+#: shell/e-shortcuts-view.c:134
 msgid "Create new shortcut group"
 msgstr "Yeni bir qısa yol qrupu yarat"
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:137
 msgid "Group name:"
 msgstr "Qrup adı :"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:260
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -6820,73 +7111,73 @@ msgstr ""
 "`%s' Qrupunu qısa yol çubuğundan həqiqətən \n"
 "də silmək istəyisiniz?"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:265
 msgid "Don't remove"
 msgstr "Silmə"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:276
 msgid "_Small Icons"
 msgstr "_Kiçik Timsallar"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:277
 msgid "Show the shortcuts as small icons"
 msgstr "Qısa yolları kiçik timsallar olaraq göstər"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:279
 msgid "_Large Icons"
 msgstr "_Böyük Timsallar"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:280
 msgid "Show the shortcuts as large icons"
 msgstr "Qısa yolları böyük timsallar olaraq göstər"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:291
 msgid "_New Group..."
 msgstr "_Yeni Qrup..."
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:292
 msgid "Create a new shortcut group"
 msgstr "Yeni bir qısa yol qrupu yarat"
 
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:294
 msgid "_Remove This Group..."
 msgstr "Bu Qrupu _Sil..."
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:295
 msgid "Remove this shortcut group"
 msgstr "Bu qısa yol qrupunusil"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:300
 msgid "_Hide the Shortcut Bar"
 msgstr "Qısa yol Çubuğunu _Gizlət"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:301
 msgid "Hide the shortcut bar"
 msgstr "Qısa yol Çubuğunu Gizlət"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate"
 msgstr "Fəallaşdır"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate this shortcut"
 msgstr "Bu qısa yolu fəallaşdırs"
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:388
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu qısa yolu qısa yol çubuğundan sil"
 
-#: shell/e-shortcuts.c:375
+#: shell/e-shortcuts.c:379
 msgid "Error saving shortcuts."
 msgstr "Qısa yolları qeyd edərkən xəta oldu."
 
-#: shell/e-storage-set-view.c:589 ui/evolution-event-editor.xml.h:76
+#: 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 "_Göstər"
 
-#: shell/e-storage-set-view.c:589
+#: shell/e-storage-set-view.c:649
 msgid "View the selected folder"
 msgstr "Seçili qovluğu göstər"
 
@@ -6894,47 +7185,47 @@ msgstr "Seçili qovluğu göstər"
 msgid "(No name)"
 msgstr "( Adsızdır )"
 
-#: shell/e-storage.c:429
+#: shell/e-storage.c:459
 msgid "No error"
 msgstr "Xəta yoxdur"
 
-#: shell/e-storage.c:431
+#: shell/e-storage.c:461
 msgid "Generic error"
 msgstr "Ümumi xəta"
 
-#: shell/e-storage.c:433
+#: shell/e-storage.c:463
 msgid "A folder with the same name already exists"
 msgstr "Eyni adlı bir qovluq onsuz da var"
 
-#: shell/e-storage.c:435
+#: shell/e-storage.c:465
 msgid "The specified folder type is not valid"
 msgstr "Bildirilən qovluq növü hökmlü deyildir"
 
-#: shell/e-storage.c:437
+#: shell/e-storage.c:467
 msgid "I/O error"
 msgstr "G/Ç xətası"
 
-#: shell/e-storage.c:439
+#: shell/e-storage.c:469
 msgid "Not enough space to create the folder"
 msgstr "Qovluğu yaratmaq üçün lazımi disk sahəsi yoxdur"
 
-#: shell/e-storage.c:441
+#: shell/e-storage.c:471
 msgid "The specified folder was not found"
 msgstr "Bildirilən qovluq tapıla bilmədi"
 
-#: shell/e-storage.c:443
+#: shell/e-storage.c:473
 msgid "Function not implemented in this storage"
 msgstr "Funksiya yazılmamışdır"
 
-#: shell/e-storage.c:445
+#: shell/e-storage.c:475
 msgid "Permission denied"
 msgstr "Qadağandır"
 
-#: shell/e-storage.c:447
+#: shell/e-storage.c:477
 msgid "Operation not supported"
 msgstr "Əməliyyat dəstəklənmir"
 
-#: shell/e-storage.c:449
+#: shell/e-storage.c:479
 msgid "The specified type is not supported in this storage"
 msgstr "Bu qeydlərdə belirtilen növ dəstəklənmir"
 
@@ -6942,7 +7233,7 @@ msgstr "Bu qeydlərdə belirtilen növ dəstəklənmir"
 msgid "The Evolution shell."
 msgstr "'Evolution' qabığı."
 
-#: shell/main.c:73
+#: shell/main.c:83
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -6973,7 +7264,7 @@ msgstr ""
 "fikirlərinizi\n"
 "gözləyirik!\n"
 
-#: shell/main.c:98
+#: shell/main.c:108
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6981,15 +7272,19 @@ msgstr ""
 "Minnətdarıq\n"
 "\"Evolution\" Dəstəsi\n"
 
-#: shell/main.c:129
+#: shell/main.c:139
 msgid "Cannot initialize the Evolution shell."
 msgstr "\"Evolution\" qabığını başlada bilmədim ."
 
-#: shell/main.c:175
-msgid "Disable."
-msgstr "Bağla."
+#: shell/main.c:185
+msgid "Disable splash screen"
+msgstr ""
 
-#: shell/main.c:195
+#: shell/main.c:186
+msgid "Send the debugging output of all components to a file."
+msgstr ""
+
+#: shell/main.c:219
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo parçalar sistemini başlada bilmədim."
 
@@ -7013,8 +7308,7 @@ msgstr "Bir əlaqəni axtar"
 msgid "New contact"
 msgstr "Yeni əlaqə"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:22
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
 msgid "Previews the message to be printed"
 msgstr "Çap ediləcək ismarıcı nümayiş etdirər"
 
@@ -7022,7 +7316,7 @@ msgstr "Çap ediləcək ismarıcı nümayiş etdirər"
 msgid "Print contacts"
 msgstr "Əlaqələri çap et"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:47
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
 msgid "Stop"
 msgstr "Dayan"
 
@@ -7056,7 +7350,7 @@ 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:77
+#: 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"
 msgstr "_Vasitələr"
@@ -7137,6 +7431,11 @@ msgstr "Təqvimi Aç"
 msgid "Prev"
 msgstr "Geri"
 
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Previews the calendar to be printed"
+msgstr "Çap ediləcək ismarıcı nümayiş etdirər"
+
 #: ui/evolution-calendar.xml.h:25
 msgid "Print calendar"
 msgstr "Təqvimi çap et"
@@ -7169,8 +7468,8 @@ msgstr "2 həftəni öster"
 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:223
-#: widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
+#: widgets/misc/e-dateedit.c:422
 msgid "Today"
 msgstr "Bugün"
 
@@ -7206,7 +7505,7 @@ msgstr "_Yeni"
 msgid "_Open Calendar"
 msgstr "_Təqvimi aç"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:74
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
 #: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "Fərqli _Qeyd Et ..."
@@ -7238,7 +7537,7 @@ 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:32 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Çap Et ..."
 
@@ -7325,7 +7624,7 @@ msgstr "Bu iclası qapat"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "Qovluğa Kö_çür... (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
+#: 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"
@@ -7415,7 +7714,7 @@ msgid "Print Setup"
 msgstr "Çap Qurğuları"
 
 #: 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
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Qeyd Et"
 
@@ -7436,7 +7735,8 @@ msgstr "_Görüşləri Planlaşdır"
 msgid "Schedule some sort of a meeting"
 msgstr "Bəzi növ görüşləri planlaşdır"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+#: 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 "Hamısını Seç"
 
@@ -7515,7 +7815,7 @@ msgstr "_Yapışdır"
 msgid "_Print"
 msgstr "_Çap Et"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:70
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Seçənəklər..."
@@ -7553,247 +7853,375 @@ msgstr "İcracı Mündəricat Qurğuları..."
 msgid "New Mail"
 msgstr "Yeni Məktub"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-mail.xml.h:2
+msgid "Apply any new filters to the mail in this box"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:3
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:4
 msgid "Compose"
 msgstr "Yaz"
 
-#: ui/evolution-mail.xml.h:2
+#: ui/evolution-mail.xml.h:5
 msgid "Compose a new message"
 msgstr "Yeni bir ePoçt ismarıcı yaz"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Configure Folder..."
+msgstr "Qovluğa Daşı..."
+
+#: ui/evolution-mail.xml.h:8
 msgid "Copy message to a new folder"
 msgstr "İsmarıcları yeni bir qovluğa daşı"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail.xml.h:9
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "İsmarıcları yeni bir qovluğa daşı"
+
+#: ui/evolution-mail.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "İsmarıcdan _Virtual Qovluq Yarat"
 
-#: ui/evolution-mail.xml.h:8
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Delete the selected messages"
+msgstr "Seçili ismarıcı çap et"
+
+#: 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.xml.h:9
+#: ui/evolution-mail.xml.h:15
+#, fuzzy
+msgid "Edit Message"
+msgstr "İsmarıcı Çap Et"
+
+#: ui/evolution-mail.xml.h:16
+#, fuzzy
+msgid "Edit the current message"
+msgstr "indiki vaxt"
+
+#: ui/evolution-mail.xml.h:17
 #, fuzzy
 msgid "Empty _Trash"
 msgstr "Zibil Qutusunu Boşalt"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Expunge"
+msgstr "_Təmizlə"
+
+#: ui/evolution-mail.xml.h:19
 msgid "Filter on Se_nder"
 msgstr "Gö_ndərənə görə Süz"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:20
 msgid "Filter on _Recipients"
 msgstr "Alı_cıya görə Süz"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:21
 msgid "Filter on _Subject"
 msgstr "Möv_zuya  görə Süz"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:22
+msgid "Finaly remove all mails tagged for deletion"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:23
 msgid "Forget _Passwords"
 msgstr "_Parolları Unut"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:25
 msgid "Forward As"
 msgstr "Fərqli Çatdır"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail.xml.h:27
+msgid "Forward the selected mail to someone"
+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.xml.h:30
 #, fuzzy
 msgid "Full _Headers"
 msgstr "Tam Başlıqlar"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:31
+#, fuzzy
+msgid "Hide Deleted Messages"
+msgstr "_Silinmiş İsmarıcları Gizlət"
+
+#: ui/evolution-mail.xml.h:32
 msgid "Hide S_elected Messages"
 msgstr "S_eçili İsmarıcları Gizlət"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:33
 msgid "Hide _Deleted Messages"
 msgstr "_Silinmiş İsmarıcları Gizlət"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:34
 msgid "Hide _Read messages"
 msgstr "_Oxunmuş İsmarıcları Gizlət"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:35
+#, fuzzy
+msgid "Invert Selection"
+msgstr "Seçkiyi _Tərs Çevir"
+
+#: ui/evolution-mail.xml.h:36
 msgid "Manage _Subscriptions..."
 msgstr "Al_t Qeydləri İdarə Et..."
 
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:37
 msgid "Mar_k as Read"
 msgstr "Oxun_muş olaraq İşarətlə"
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:38
 msgid "Mark All as R_ead"
 msgstr "Hamısını O_xunmış olaraq İşarətlə"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:39
+#, fuzzy
+msgid "Mark As Read"
+msgstr "Oxunmış olaraq işarətlə"
+
+#: ui/evolution-mail.xml.h:40
+msgid "Mark As U_nread"
+msgstr "Oxun_mamış Olaraq İşarətlə"
+
+#: ui/evolution-mail.xml.h:41
 msgid "Mark as U_nread"
 msgstr "Ox_unmamış olaraq İşarətlə"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:42
+#, fuzzy
+msgid "Mark the selected messages as having been read"
+msgstr "Seçili ismarıcı çap et"
+
+#: ui/evolution-mail.xml.h:43
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:44
 msgid "Move"
 msgstr "Daşı"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:45
 msgid "Move message to a new folder"
 msgstr "İsmarıcı yeni bir qovluğa daşı"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:46
+#, fuzzy
+msgid "Move selected messages to another folder"
+msgstr "İsmarıcı yeni bir qovluğa daşı"
+
+#: ui/evolution-mail.xml.h:47
+msgid "Open in New Window"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Open the current message in a new window"
+msgstr "İsmarıcı indi göndər"
+
+#: ui/evolution-mail.xml.h:53
+msgid "Print Preview of message..."
+msgstr "İsmarıcın çap etmə Nümayişi..."
+
+#: ui/evolution-mail.xml.h:54
 msgid "Print message to the printer"
 msgstr "İsmarıcı çap et"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:55
+msgid "Print message..."
+msgstr "İsmarıcı çap et ..."
+
+#: ui/evolution-mail.xml.h:58
 msgid "Redirect (FIXME: implement me)"
 msgstr "İstiqamətləndir (FIXME: məni qəbul et)"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:61
 msgid "Reply to _All"
 msgstr "_Hamısına Cavab Ver"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:62
+#, fuzzy
+msgid "Reply to all"
+msgstr "Hamısına cavab ver"
+
+#: ui/evolution-mail.xml.h:64
+#, fuzzy
+msgid "Reply to sender"
+msgstr "Göndərənə cavab ver"
+
+#: ui/evolution-mail.xml.h:66
 msgid "S_ource"
 msgstr "Qa_ynaq"
 
-#: ui/evolution-mail.xml.h:40 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "Save the message into a new file"
+msgstr "İsmarıcı bildirilən qovluqda qeyd et"
+
+#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "_Hamısını Seç"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:70
 msgid "Select _Thread"
 msgstr "İl_gəyi Seç"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:71
 #, fuzzy
 msgid "Send / Receive"
 msgstr "Göndərmə və Alma"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:72
+msgid "Send a reply to the person who sent you this mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:73
+msgid "Send a single mail in reply to all the selected mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:74
 #, fuzzy
 msgid ""
 "Send queued mail\n"
 "    and retrieve new mail"
 msgstr "Sorğulanmış məktubu göndər və yeni məktubları al"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:76
 msgid "Send queued mail and retrieve new mail"
 msgstr "Sorğulanmış məktubu göndər və yeni məktubları al"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:77
 msgid "Show _All"
 msgstr "_Hamısını Göstər"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:79
 msgid "Threaded Message list"
 msgstr "İlgək_lənmiş İsmarıclar Siyahısı"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:80
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "Seçili ismarıcı çap et"
+
+#: ui/evolution-mail.xml.h:82
 msgid "VFolder on Se_nder"
 msgstr "Gön_dərəndəki vFolder"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:83
 msgid "VFolder on _Recipients"
 msgstr "_Alıcıdakı vFolder"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:84
 msgid "VFolder on _Subject"
 msgstr "_Mövzudakı vFolder"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:85
 msgid "View Raw Message Source"
 msgstr "Çiy İsmarıc Qaynağını Göstər"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:86
 msgid "Virtual Folder _Editor..."
 msgstr "Virtual Qovluq _Düzəldicisi..."
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:87
 msgid "_Apply Filters"
 msgstr "Süzgəcləri Ə_lavə Et"
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:88
 #, fuzzy
 msgid "_Attachment"
 msgstr "Yapışdırılmış fayl"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Compose"
-msgstr "_Yaz"
-
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:89
 msgid "_Copy to Folder..."
 msgstr "Qovluğa _Köçürt..."
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:90
 msgid "_Create Filter From Message"
 msgstr "İsmarıcdan Qayda _Yarat"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:92
 msgid "_Expunge"
 msgstr "_Təmizlə"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:93
 msgid "_Filters..."
 msgstr "_Süzgəclər ..."
 
-#: ui/evolution-mail.xml.h:62 ui/evolution.xml.h:31
+#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
 msgid "_Folder"
 msgstr "_Qovluq"
 
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:95
 msgid "_Forward"
 msgstr "_Çatdır"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:96
 #, fuzzy
 msgid "_Inline"
 msgstr "Daxili"
 
-#: ui/evolution-mail.xml.h:65 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Seçkiyi _Tərs Çevir"
 
-#: ui/evolution-mail.xml.h:66
+#: ui/evolution-mail.xml.h:98
 msgid "_Mail Message"
 msgstr "_Məktub İsmarıcı"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:99
 msgid "_Mail Settings..."
 msgstr "_Məktub Qurğuları..."
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:100
 msgid "_Move to Folder..."
 msgstr "Qovluğa _Daşı ..."
 
-#: ui/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:101
 msgid "_Open Selected Items"
 msgstr "Seçili Üzvləri _Aç"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail.xml.h:103
 #, fuzzy
 msgid "_Quoted"
 msgstr "Kota qoyulmuş"
 
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail.xml.h:104
 #, fuzzy
 msgid "_Reply"
 msgstr "Cavab ver"
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail.xml.h:105
 #, fuzzy
 msgid "_Resend Messages"
 msgstr "_İsmarıcları Düzəlt"
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail.xml.h:107
+msgid "_Save Message As..."
+msgstr "İsmarıcları _Fərqli Qeyd Et ..."
+
+#: ui/evolution-mail.xml.h:108
 #, fuzzy
 msgid "_Send / Receive"
 msgstr "_Göndərmə və Alma"
 
-#: ui/evolution-mail.xml.h:76
+#: ui/evolution-mail.xml.h:109
 msgid "_Threaded"
 msgstr "_İlgəklənmiş"
 
-#: ui/evolution-mail.xml.h:78
+#: ui/evolution-mail.xml.h:111
 msgid "_Undelete"
 msgstr "_Geri Gətir"
 
@@ -8196,87 +8624,95 @@ msgstr "_Qısa Yol Çubuğu"
 
 #. 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:2475
 msgid "%A, %B %d, %Y"
 msgstr "%a %B %d %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+msgid "Tentative"
+msgstr "Girişimli"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Məşğul"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "İş Yerində Deyil"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Mə'lumat Yoxdur"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
 msgid "_Invite Others..."
 msgstr "Başqalarını _Dəvət Et ..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
 msgid "_Options"
 msgstr "_Seçənəklər"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
 msgid "Show _Only Working Hours"
 msgstr "Sadəcə olaraq -İş Saatlarını Göstər"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
 msgid "Show _Zoomed Out"
 msgstr "_Uzaqlaşdıraraq Göstər"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
 msgid "_Update Free/Busy"
 msgstr "Boş/Məşğulları _Təzələ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr "_Avtomarik Olaraq Seç"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
 msgid "_All People and Resources"
 msgstr "_Bütün Adamlar və Qaynaqlar"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
 msgid "All _People and One Resource"
 msgstr "Bütün _adamlar və Bir Qaynaq"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
 msgid "_Required People"
 msgstr "_Lazımi Adamlar"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
 msgid "Required People and _One Resource"
 msgstr "Lazımi Adamlar və _Bir Qaynaq"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
 msgid "Meeting _start time:"
 msgstr "İclas başlama saatı :"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
 msgid "Meeting _end time:"
 msgstr "İclas sonlanma saatı :"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
 msgid "All Attendees"
 msgstr "Bütün Ziyarətçilər"
 
-#: widgets/menus/gal-view-menus.c:171
+#: widgets/menus/gal-view-menus.c:177
 msgid "_Current View"
 msgstr "_Hazırkı Görünüş"
 
+#: widgets/menus/gal-view-menus.c:196
+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
@@ -8288,15 +8724,15 @@ msgstr "MTWTFSS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
 msgid "Now"
 msgstr "İndi"
 
-#: widgets/misc/e-cell-date-edit.c:239
+#: widgets/misc/e-cell-date-edit.c:242
 msgid "OK"
 msgstr "Oldu"
 
-#: widgets/misc/e-cell-date-edit.c:720
+#: widgets/misc/e-cell-date-edit.c:723
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -8308,43 +8744,83 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:160
+#: widgets/misc/e-filter-bar.c:166
 msgid "Save Search"
 msgstr "Axtarışı Qeyd Et"
 
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Ətraflı Axtarış"
 
-#: widgets/misc/e-filter-bar.c:311
+#: widgets/misc/e-filter-bar.c:317
 msgid "Advanced ..."
 msgstr "Ətraflı ..."
 
-#: widgets/misc/e-messagebox.c:141
+#: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Mə'lumat"
 
-#: widgets/misc/e-messagebox.c:148
+#: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Xəbərdarlıq"
 
-#: widgets/misc/e-messagebox.c:162
+#: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Sual"
 
-#: widgets/misc/e-messagebox.c:169
+#: widgets/misc/e-messagebox.c:180
 msgid "Message"
 msgstr "İsmarıc"
 
 #. 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 "Bu ismarıcı bir də göstərmə."
 
-#: widgets/misc/e-search-bar.c:140
+#: widgets/misc/e-search-bar.c:148
 msgid "Sear_ch"
 msgstr "Ax_tar"
 
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Adress Cards"
+msgstr "ünvan kartı"
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "Şirkət"
+
+#: views/addressbook/galview.xml.h:3
+#, fuzzy
+msgid "Phone List"
+msgstr "Telefon Növləri"
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "Göndərən"
+
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "Hal"
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "Mövzu"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "İsmarıc"
+
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With Category"
+msgstr "Kateqoriyalar:"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "Şəxsi Ünvan Dəftəri Vericisi"
@@ -8353,20 +8829,212 @@ msgstr "Şəxsi Ünvan Dəftəri Vericisi"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Şəxsi Ünvan Dəftəri Vericisi; təqvim e'malatxanası"
 
-#: wombat/wombat.c:165
+#: wombat/wombat.c:173
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME_VFS başladıla bilmədi"
 
-#: wombat/wombat.c:177
+#: wombat/wombat.c:185
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): GNOME başladıla bilmədi"
 
-#: wombat/wombat.c:190
+#: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 
-#~ msgid "This server requires a secure connection (SSL)"
-#~ msgstr "Bu verici (SSL) tanıdılmasına ehtiyac hiss edər"
+#~ msgid "Click here to add a contact"
+#~ msgstr "Əlaqəni əlavə etmək üçün tıqlayın>"
+
+#~ msgid "PLAIN"
+#~ msgstr "PLAIN"
+
+#~ msgid ""
+#~ "This option will connect to the server using a the PLAIN SASL mechanism if "
+#~ "the server supports it."
+#~ msgstr ""
+#~ "Bu seçənək ,əgər dəstəkləyirsə, verici ilə PLAIN SASL mexanizması "
+#~ "ilə ünsiyyət quracaqdır."
+
+#~ msgid "No such host %s."
+#~ msgstr "%s Ev sahibi mövcud deyildir."
+
+#~ msgid "Temporarily unable to look up hostname %s."
+#~ msgstr "%s ev sahibi müvəqqəti olaraq axtarıla bilmir."
+
+#~ msgid "URL string `%s' contains no protocol"
+#~ msgstr "`%s' URL kəliməsi protokol haqqında mə'lumat daxil etmir"
+
+#~ msgid "URL string `%s' contains an invalid protocol"
+#~ msgstr ""
+#~ "`%s' URL kəliməsi hökmsüz protokol haqqında mə'lumat daxil edir"
+
+#~ msgid "Port number in URL `%s' is non-numeric"
+#~ msgstr ""
+#~ "`%s' URLsindəki qapı nömrəßi rəqəm xaricində xarakter daxil edir"
+
+#~ msgid "Secure IMAPv4"
+#~ msgstr "E'tibarlı IMAPv4"
+
+#~ msgid "For reading and storing mail on IMAP servers over an SSL connection."
+#~ msgstr ""
+#~ "SSL bağlantısı üstündən IMAP vericisində məktubların saxlanması "
+#~ "və oxuna bilməsi üçün."
+
+#~ msgid "Secure POP"
+#~ msgstr "E'tibarlı 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 "
+#~ "proprietary email systems."
+#~ msgstr ""
+#~ "POP vericilərinə SSL üstündən bağlanmaq üçündür. POP protokolu "
+#~ "eyni zamanda bə'zi veb məktub sistemlərindən məktub almaq üçün də "
+#~ "işlədilə bilir."
+
+#~ msgid "Secure SMTP"
+#~ msgstr "E'tibarlı SMTP"
+
+#~ msgid ""
+#~ "For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+#~ "connection.\n"
+#~ msgstr ""
+#~ "SMTP istifadə edilərək uzaq məktub yayıcısına bağlanaraq məktub "
+#~ "göndərmək üçün.\n"
+
+#~ msgid "No authentication required"
+#~ msgstr "Tanıtma lazım deyildir."
+
+#~ 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 ""
+#~ "Bu seçənək SMTP vericisi ilə təßdiqlənməyə ehtiyac hiss etmədən "
+#~ "ünsiyyət qurar. Bu da bir çox vericiyə bağlanmaq üçün yaxşı "
+#~ "fikirdir."
+
+#~ msgid "Remove action"
+#~ msgstr "Gedişi sil"
+
+#~ msgid "Remove criterion"
+#~ msgstr "Kriteriyanı sil"
+
+#~ msgid ""
+#~ "One or more of your servers are not configured correctly.\n"
+#~ "Do you wish to save anyway?"
+#~ msgstr ""
+#~ "Bir və ya daha çox xidmət düzgün quraşdırılmayıb.\n"
+#~ "Yenə də qeyd etmək istəyisinizmi?"
+
+#~ msgid "Unspecified"
+#~ msgstr "Bildirilməmiş"
+
+#~ msgid "Advanced"
+#~ msgstr "Ətraflı"
+
+#~ msgid "Check settings"
+#~ msgstr "Qurğuları Sına"
+
+#~ msgid "Email address:"
+#~ msgstr "ePoçt ünvanı : "
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Evolution ePoçt Quraşdırılması"
+
+#~ msgid "Hostname:"
+#~ msgstr "Verici Adı:"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#~ msgid "Include this account when receiving mail"
+#~ msgstr "Məktub alındığında bu hesabı daxil et"
+
+#~ msgid "Keep mail on server"
+#~ msgstr "Məktubu vericidə saxla"
+
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos"
+
+#~ msgid "Mail"
+#~ msgstr "Məktub"
+
+#~ msgid "Mail Account"
+#~ msgstr "ePoçt Hesabı"
+
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "ePoçt Quraşdırılması Vasitəsi"
+
+#~ msgid "Optional"
+#~ msgstr "Arzuya Görə"
+
+#~ msgid "Password:"
+#~ msgstr "Parol:"
+
+#~ msgid "Plain Text"
+#~ msgstr "Düz Mətn"
+
+#~ msgid "Remember my password"
+#~ msgstr "Mənim parolumu yadda saxla"
+
+#~ msgid "Reply address:"
+#~ msgstr "Cavab ünvanı:"
+
+#~ msgid "Required"
+#~ msgstr "Lazımi"
+
+#~ msgid "Save password"
+#~ msgstr "Parolu Qeyd Et"
+
+#~ msgid "Select signature file"
+#~ msgstr "Imza faylını seç"
+
+#~ msgid "Server type:"
+#~ msgstr "Verici növü:"
+
+#~ msgid "Signature:"
+#~ msgstr "Imza:"
+
+#~ msgid "Source"
+#~ msgstr "Qaynaq"
+
+#~ msgid "Transport"
+#~ msgstr "Nəqliyyat"
+
+#~ msgid "Transport Authentication"
+#~ msgstr "Nəqliyyat Tanıdılması"
+
+#~ msgid ""
+#~ "Type the name by which you would like to refer to these servers. For "
+#~ "example: \"Work\" or \"Home\"."
+#~ msgstr ""
+#~ "Bu vericiləri izah edən sözləri yazın. Məsələn: \n"
+#~ "\"İs Yeri\" və ya \"Ev\"."
+
+#~ msgid "minutes."
+#~ msgstr "dəqiqə."
+
+#~ msgid ""
+#~ "Failed to verify the incoming mail configuration.\n"
+#~ "You may experience problems retrieving your mail from %s"
+#~ msgstr ""
+#~ "Gələn məktubun quruluşu başa düşülmədi.\n"
+#~ "%s dan(dən) məktub alınmasında problem yaşaya biləsiniz"
+
+#~ msgid ""
+#~ "Failed to verify the outgoing mail configuration.\n"
+#~ "You may experience problems sending your mail using %s"
+#~ msgstr ""
+#~ "Gedən məktub qurğuları başa düşülmədi.\n"
+#~ "%s a(ə) məktub göndərilməsində problem yaşaya biləsiniz"
+
+#~ msgid "%s message %d of %d (uid \"%s\")"
+#~ msgstr "%s message %d of %d (uid \"%s\")"
+
+#~ msgid "No GPG/PGP program available."
+#~ msgstr "Heç bir GPG/PGP proqramı yoxdur"
+
+#~ msgid "_Compose"
+#~ msgstr "_Yaz"
 
 #~ msgid "[ %s ]"
 #~ msgstr "[ %s ]"
@@ -8405,9 +9073,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ "Yerli sistem tərəfindən gətirilən mektubları oxumaq və məktubların "
 #~ "yerli faylları üçün diskdə saxlamaq üçün."
 
-#~ msgid "Connecting to server"
-#~ msgstr "Vericiyə bağlanılır"
-
 #~ msgid "Connect to server"
 #~ msgstr "Vericiyə Bağlan"
 
@@ -8599,13 +9264,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "Registering local folder"
 #~ msgstr "Yerli qovluq qeydiyyatdan keçirilir"
 
-#~ msgid ""
-#~ "Unable to register folder '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "'%s' Qovluğu qeydiyyatdan keçirilə bilmədi:\n"
-#~ "%s"
-
 #~ msgid "Fetching email from %s"
 #~ msgstr "%s dan(dən) ePoçt alınır"
 
@@ -8689,9 +9347,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "Retrieving message %d of %d"
 #~ msgstr "%d nin(nın) %d ismarıcı alınır"
 
-#~ msgid "Writing message %d of %d"
-#~ msgstr "%d nin(nın) %d ismarıcı yazılır"
-
 #~ msgid "Saving changes to %s"
 #~ msgstr "%s a(ə) dəyişiklikllər qeyd edilir"
 
@@ -8705,9 +9360,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "Get store for \"%s\""
 #~ msgstr "\"%s\" üçün saxlama aməliyyatı apar"
 
-#~ msgid "Subscribe to folder \"%s\""
-#~ msgstr "\"%s\" qovluğuna qeyd ol"
-
 #~ msgid "Unsubscribe from folder \"%s\""
 #~ msgstr "\"%s\" qovluğundan qeyd silinir"
 
@@ -8936,12 +9588,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "Server:"
 #~ msgstr "Verici :"
 
-#~ msgid "Detect supported types..."
-#~ msgstr "Dəstəklənən növləri sına..."
-
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Vericidan ismarıcları silmə"
-
 #~ msgid "Mail source type:"
 #~ msgstr "ePoçt qaynağı növü"
 
@@ -9002,9 +9648,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "Edit News Server"
 #~ msgstr "Xəbər Vericisini Düzəlt"
 
-#~ msgid "Testing \"%s\""
-#~ msgstr "\"%s\" Sınanır"
-
 #~ msgid "Identities"
 #~ msgstr "Kimliklər"
 
@@ -9065,15 +9708,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "_Replace..."
 #~ msgstr "_Dəyişdir..."
 
-#~ msgid "Mark As U_nread"
-#~ msgstr "Oxun_mamış Olaraq İşarətlə"
-
-#~ msgid "Print Preview of message..."
-#~ msgstr "İsmarıcın çap etmə Nümayişi..."
-
-#~ msgid "Print message..."
-#~ msgstr "İsmarıcı çap et ..."
-
 #~ msgid "Reply to _Sender"
 #~ msgstr "_Göndərənə Cavab Ver"
 
@@ -9086,9 +9720,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "_Print Message"
 #~ msgstr "İsmarıcı Ça_p Et"
 
-#~ msgid "_Save Message As..."
-#~ msgstr "İsmarıcları _Fərqli Qeyd Et ..."
-
 #~ msgid "_Source"
 #~ msgstr "_Qaynaq"
 
@@ -9445,9 +10076,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "_Format"
 #~ msgstr "Şə_kil"
 
-#~ msgid "Check for new mail"
-#~ msgstr "Yeni ePoçt üçün bax"
-
 #~ msgid "_vFolder Editor ..."
 #~ msgstr "_vFolder Düzəldicisi ..."
 
diff --git a/po/ca.po b/po/ca.po
index d4a5c7f138..a2426ff409 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-03-15 11:05+0100\n"
+"POT-Creation-Date: 2001-04-14 08:51-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,208 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3209
 #, fuzzy
 msgid "Card: "
 msgstr "Cotxe"
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3211
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Nom:"
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3212
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3057
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3058
+#: addressbook/backend/ebook/e-card.c:3214
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3059
+#: addressbook/backend/ebook/e-card.c:3215
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3060
+#: addressbook/backend/ebook/e-card.c:3216
 #, fuzzy
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr "_Sufix:"
 
-#: addressbook/backend/ebook/e-card.c:3074
+#: addressbook/backend/ebook/e-card.c:3230
 #, fuzzy
 msgid ""
 "\n"
 "Birth Date: "
 msgstr "Data d'ini_ci:"
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3241
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "_Adre�a:"
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3243
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3244
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3245
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3090
+#: addressbook/backend/ebook/e-card.c:3246
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3091
+#: addressbook/backend/ebook/e-card.c:3247
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3092
+#: addressbook/backend/ebook/e-card.c:3248
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3093
+#: addressbook/backend/ebook/e-card.c:3249
 #, fuzzy
 msgid ""
 "\n"
 "  Country:     "
 msgstr "Pa�_s:"
 
-#: addressbook/backend/ebook/e-card.c:3106
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3118
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3121
+#: addressbook/backend/ebook/e-card.c:3277
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3145
+#: addressbook/backend/ebook/e-card.c:3301
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "Adre�a electr�nica 2"
 
-#: addressbook/backend/ebook/e-card.c:3148
+#: addressbook/backend/ebook/e-card.c:3304
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "Adre�a electr�nica 2"
 
-#: addressbook/backend/ebook/e-card.c:3167
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3173
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3185
+#: addressbook/backend/ebook/e-card.c:3341
 #, fuzzy
 msgid ""
 "\n"
 "Business Role: "
 msgstr "Feina 2"
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3354
 #, fuzzy
 msgid ""
 "\n"
 "  Name:  "
 msgstr "Nom:"
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3355
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3201
+#: addressbook/backend/ebook/e-card.c:3357
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3206
+#: addressbook/backend/ebook/e-card.c:3362
 #, fuzzy
 msgid ""
 "\n"
 "Categories: "
 msgstr "categories"
 
-#: addressbook/backend/ebook/e-card.c:3207
+#: addressbook/backend/ebook/e-card.c:3363
 #, fuzzy
 msgid ""
 "\n"
@@ -233,13 +233,13 @@ msgstr "Comentaris sobre l'element:"
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3220
+#: addressbook/backend/ebook/e-card.c:3376
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3223
+#: addressbook/backend/ebook/e-card.c:3379
 #, fuzzy
 msgid ""
 "\n"
@@ -254,15 +254,15 @@ msgstr ""
 msgid "Imports GnomeCard files into Evolution."
 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
+#: 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:68 calendar/gui/main.c:54
+#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
 msgid "Could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
@@ -274,20 +274,20 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:651
+#: addressbook/conduit/address-conduit.c:654
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "No s'ha pogut iniciar el servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:652
+#: addressbook/conduit/address-conduit.c:655
 #: calendar/conduits/calendar/calendar-conduit.c:732
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "No s'ha pogut iniciar el 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 "No s'ha pogut llegir el bloc d'aplicaci� d'adre�a del Pilot"
 
@@ -295,7 +295,7 @@ msgstr "No s'ha pogut llegir el bloc d'aplicaci� d'adre�a del Pilot"
 #: 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:4
+#: mail/mail-config.glade.h:7
 msgid "Add"
 msgstr "Afegeix"
 
@@ -336,7 +336,6 @@ msgstr "Arxiva com:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:10
 #: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:27
 msgid "General"
 msgstr "General"
 
@@ -353,7 +352,7 @@ msgid "Phone Types"
 msgstr "Tipus de tel�fon"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "Primary Email"
 msgstr "Adre�a electr�nica principal"
 
@@ -366,7 +365,7 @@ msgid "Web page address:"
 msgstr "Adre�a de p�gina web:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:74
 msgid "_Add"
 msgstr "_Afegeix"
 
@@ -391,8 +390,8 @@ msgid "_Company:"
 msgstr "_Empresa:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
+#: 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"
 msgstr "_Suprimeix"
 
@@ -444,129 +443,125 @@ msgstr "_Aquesta �s l'adre�a de correu"
 msgid "Delete Contact?"
 msgstr "Voleu suprimir el contacte?"
 
-#: addressbook/contact-editor/e-contact-editor.c:590
+#: addressbook/contact-editor/e-contact-editor.c:603
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "El(s) element(s) pertanyen a aquestes categories:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/widgets/e-addressbook-view.c:676
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1297
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1310
 msgid "Business"
 msgstr "Feina"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/contact-editor/e-contact-editor.c:1244
 msgid "Business 2"
 msgstr "Feina 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Business Fax"
 msgstr "Fax de la feina"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Callback"
 msgstr "Crida de retorn"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "Car"
 msgstr "Cotxe"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1248
 msgid "Company"
 msgstr "Empresa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
-#: addressbook/contact-editor/e-contact-editor.c:1298
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1311
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/contact-editor/e-contact-editor.c:1250
 msgid "Home 2"
 msgstr "Particular 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Home Fax"
 msgstr "Fax particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "ISDN"
 msgstr "XDSI"
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/contact-editor/e-contact-editor.c:1253
 msgid "Mobile"
 msgstr "M�bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/contact-editor/e-contact-editor.c:1299
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
+#: 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"
 msgstr "Altres"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:662
 msgid "Other Fax"
 msgstr "Un altre fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Pager"
 msgstr "Busca"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1257
 msgid "Primary"
 msgstr "Primari"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/gui/widgets/e-addressbook-view.c:664
 msgid "Radio"
 msgstr "R�dio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/widgets/e-addressbook-view.c:665
 msgid "Telex"
 msgstr "T�lex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:1260
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
-#: addressbook/gui/widgets/e-addressbook-view.c:593
+#: 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:1273
-#: addressbook/gui/widgets/e-addressbook-view.c:594
+#: 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:214
+#: addressbook/contact-editor/e-contact-quick-add.c:223
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:216
+#: addressbook/contact-editor/e-contact-quick-add.c:225
 #, fuzzy
 msgid "Edit Full"
 msgstr "Filtres d'edici�"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:253
+#: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/widgets/e-addressbook-view.c:643
 #, fuzzy
 msgid "Full Name"
 msgstr "Nom complet:"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:259
+#: addressbook/contact-editor/e-contact-quick-add.c:268
 #, fuzzy
 msgid "E-mail"
 msgstr "Adre�a electr�nica 2"
@@ -685,25 +680,25 @@ msgstr "_Sufix:"
 msgid "_Title:"
 msgstr "_T�tol:"
 
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:241
 msgid "As _Minicards"
 msgstr "Com a _Minicards"
 
-#: addressbook/gui/component/addressbook.c:243
+#: addressbook/gui/component/addressbook.c:247
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Com a _taula"
 
-#: addressbook/gui/component/addressbook.c:412
+#: 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:440
+#: 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:445
+#: addressbook/gui/component/addressbook.c:432
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -724,188 +719,188 @@ msgstr ""
 "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:568
+#: addressbook/gui/component/addressbook.c:555
 #, fuzzy
 msgid "Show All"
 msgstr "Mostra"
 
-#: addressbook/gui/component/addressbook.c:570
+#: addressbook/gui/component/addressbook.c:557
 #, fuzzy
 msgid "Advanced..."
 msgstr "Afegeix..."
 
-#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:587
 #, fuzzy
 msgid "Any field contains"
 msgstr "El cos cont�"
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:588
 #, fuzzy
 msgid "Name contains"
 msgstr "cont�"
 
-#: addressbook/gui/component/addressbook.c:602
+#: addressbook/gui/component/addressbook.c:589
 #, fuzzy
 msgid "Email contains"
 msgstr "cont�"
 
-#: addressbook/gui/component/addressbook.c:745
+#: 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:95
+#: addressbook/gui/component/addressbook-storage.c:99
 #, fuzzy
 msgid "Other Contacts"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/addressbook-config.c:143
+#: addressbook/gui/component/addressbook-config.c:148
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Servidor LDAP:"
 
-#: addressbook/gui/component/addressbook-config.c:145
+#: addressbook/gui/component/addressbook-config.c:150
 #, fuzzy
 msgid "File"
 msgstr "_Fitxer"
 
-#: addressbook/gui/component/addressbook-config.c:148
+#: 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:158
+#: addressbook/gui/component/addressbook-config.c:163
 msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:261
+#: 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-store.c:145
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
 msgid "Password"
 msgstr "Contrasenya"
 
-#: addressbook/gui/component/addressbook-config.c:162
+#: addressbook/gui/component/addressbook-config.c:167
 msgid "SASL"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:165
+#: addressbook/gui/component/addressbook-config.c:170
 #, fuzzy
 msgid "Unknown auth type"
 msgstr "Error desconegut"
 
-#: addressbook/gui/component/addressbook-config.c:174
+#: addressbook/gui/component/addressbook-config.c:179
 #, fuzzy
 msgid "Base"
 msgstr "Enganxa"
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:178
+#: addressbook/gui/component/addressbook-config.c:183
 #, fuzzy
 msgid "Subtree"
 msgstr "Subscriu-me"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-config.c:186
 msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:348
+#: addressbook/gui/component/addressbook-config.c:353
 msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:349
+#: addressbook/gui/component/addressbook-config.c:354
 msgid "FIXME Bind DN Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:351
+#: addressbook/gui/component/addressbook-config.c:356
+#: mail/mail-config.glade.h:50
 msgid "Remember this password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:401
+#: addressbook/gui/component/addressbook-config.c:406
 #: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Host:"
 msgstr "Hores"
 
-#: addressbook/gui/component/addressbook-config.c:402
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "FIXME Host help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:404
+#: addressbook/gui/component/addressbook-config.c:409
 #, fuzzy
 msgid "Port:"
 msgstr "Prioritat:"
 
-#: addressbook/gui/component/addressbook-config.c:405
+#: addressbook/gui/component/addressbook-config.c:410
 msgid "FIXME Port help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/component/addressbook-config.c:414
 msgid "Root DN:"
 msgstr "DN arrel:"
 
-#: addressbook/gui/component/addressbook-config.c:410
+#: addressbook/gui/component/addressbook-config.c:415
 msgid "FIXME Root DN help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:430
+#: addressbook/gui/component/addressbook-config.c:435
 #, fuzzy
 msgid "Search Scope:"
 msgstr "Cerca"
 
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:8
+#: addressbook/gui/component/addressbook-config.c:489
 msgid "Authentication:"
 msgstr "Autenticaci�:"
 
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
+#: addressbook/gui/component/addressbook-config.c:507
+#: mail/mail-config.glade.h:44
 msgid "Path:"
 msgstr "Cam�:"
 
-#: addressbook/gui/component/addressbook-config.c:503
+#: addressbook/gui/component/addressbook-config.c:508
 msgid "FIXME Path Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:508
+#: addressbook/gui/component/addressbook-config.c:513
 #, fuzzy
 msgid "Create path if it doesn't exist."
 msgstr "Aquest fitxer no existeix."
 
-#: addressbook/gui/component/addressbook-config.c:642
+#: addressbook/gui/component/addressbook-config.c:647
 #, fuzzy
 msgid "Edit Addressbook"
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook-config.c:644
+#: addressbook/gui/component/addressbook-config.c:649
 #, fuzzy
 msgid "Add Addressbook"
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook-config.c:660
+#: 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:666
-#: mail/mail-config.glade.h:41
+#: addressbook/gui/component/addressbook-config.c:671
+#: mail/mail-config.glade.h:35
 msgid "Name:"
 msgstr "Nom:"
 
-#: addressbook/gui/component/addressbook-config.c:667
+#: addressbook/gui/component/addressbook-config.c:672
 msgid "FIXME Name help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:669
+#: 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:670
+#: addressbook/gui/component/addressbook-config.c:675
 msgid "FIXME Description help text here"
 msgstr ""
 
@@ -915,23 +910,24 @@ 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:11 mail/folder-browser.c:571
-#: mail/mail-config.glade.h:20 mail/mail-view.c:150
+#: 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:7 ui/evolution-task-editor-dialog.xml.h:18
+#: 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:22
+#: mail/mail-config.glade.h:23
 msgid "Edit"
 msgstr "Edita"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Name"
 msgstr "Nom"
 
@@ -940,51 +936,74 @@ msgstr "Nom"
 msgid "URI"
 msgstr "URL:"
 
-#: addressbook/gui/component/e-address-widget.c:259
-#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#: 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"
 msgstr "Contacte _nou"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for displaying an address."
+msgid "A Bonobo control for an address popup."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A sample Bonobo control which displays an addressbook."
+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:4
+#: 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:5
+#: 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:6
+#: 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:7
+#: 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:8
+#: 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:9
+#: 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"
@@ -998,21 +1017,18 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c: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
+#: 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:136
+#: addressbook/gui/component/select-names/e-select-names-popup.c:146
 #, fuzzy
 msgid "Remove All"
 msgstr "Elimina"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
-msgid "Edit Contact Info"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Cerca..."
@@ -1030,7 +1046,7 @@ msgstr "Seleccioneu els noms"
 msgid "Select name from:"
 msgstr "Seleccioneu un nom de la llista:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
 msgid "Search"
 msgstr "Cerca"
 
@@ -1142,83 +1158,184 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:481
-#: addressbook/gui/widgets/e-minicard.c:435
+#: 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
 msgid "Save as VCard"
 msgstr "Desa com a VCard"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-minicard.c:669
+msgid "Send contact to other"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-minicard.c:670
+#, 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
+msgid "Print"
+msgstr "Imprimeix"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-minicard.c:672
+#, fuzzy
+msgid "Print Envelope"
+msgstr "Imprimeix el missatge..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:641
 #, fuzzy
 msgid "* Click here to add a contact *"
 msgstr "<feu clic aqu� per seleccionar una data>"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/gui/widgets/e-addressbook-view.c:642
+#, fuzzy
+msgid "File As"
+msgstr "Arxiva com:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:644
 #, fuzzy
 msgid "Email"
 msgstr "Adre�a electr�nica 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:645
+#, fuzzy
+msgid "Primary Phone"
+msgstr "Primari"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:646
+#, fuzzy
+msgid "Assistant Phone"
+msgstr "Assistent"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:647
+#, fuzzy
+msgid "Business Phone"
+msgstr "Feina 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:648
+#, fuzzy
+msgid "Callback Phone"
+msgstr "Crida de retorn"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:649
+#, fuzzy
+msgid "Company Phone"
+msgstr "Empresa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:650
+#, fuzzy
+msgid "Home Phone"
+msgstr "Particular 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:651
 msgid "Organization"
 msgstr "Organitzaci�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:595
+#: addressbook/gui/widgets/e-addressbook-view.c:652
+#, fuzzy
+msgid "Business Address"
+msgstr "Feina 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:653
+#, fuzzy
+msgid "Home Address"
+msgstr "Comprova l'adre�a"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:654
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "M�bil"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:658
+#, fuzzy
+msgid "Business Phone 2"
+msgstr "Feina 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:659
+#, fuzzy
+msgid "Home Phone 2"
+msgstr "Particular 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:661
+#, fuzzy
+msgid "Other Phone"
+msgstr "Contacte _nou"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:666
+#, fuzzy
+msgid "TTY"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:667
+#, fuzzy
+msgid "Other Address"
+msgstr "Comprova l'adre�a"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:670
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:596
+#: addressbook/gui/widgets/e-addressbook-view.c:671
 #, fuzzy
 msgid "Department"
 msgstr "_Departament:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:597
+#: addressbook/gui/widgets/e-addressbook-view.c:672
 #, fuzzy
 msgid "Office"
 msgstr "_Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:673
 #, fuzzy
 msgid "Title"
 msgstr "_T�tol:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:674
 #, fuzzy
 msgid "Profession"
 msgstr "_Professi�:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:600
+#: addressbook/gui/widgets/e-addressbook-view.c:675
 #, fuzzy
 msgid "Manager"
 msgstr "Busca"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 #, fuzzy
 msgid "Nickname"
 msgstr "_Sobrenom:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-view.c:678
 #, fuzzy
 msgid "Spouse"
 msgstr "_C�njuge:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: addressbook/gui/widgets/e-addressbook-view.c:679
 #, fuzzy
 msgid "Note"
 msgstr "Cap"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:606
-#, fuzzy
-msgid "Click here to add a contact"
-msgstr "<feu clic aqu� per seleccionar una data>"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-minicard-control.c:282
 msgid "Save in addressbook"
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/widgets/e-minicard-view.c:141
+#: addressbook/gui/widgets/e-minicard-view.c:166
 msgid ""
 "\n"
 "\n"
@@ -1232,7 +1349,7 @@ msgstr ""
 "\n"
 "Feu doble clic aqu� per crear un nou contacte."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #, fuzzy
 msgid "Card View"
 msgstr "Cotxe"
@@ -1417,126 +1534,127 @@ msgstr "No s'ha pogut llegir el bloc d'aplicaci� d'agenda del Pilot"
 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:233
+#: calendar/gui/calendar-commands.c:266
 msgid "File not found"
 msgstr "No s'ha trobat el fitxer"
 
-#: calendar/gui/calendar-commands.c:257
+#: calendar/gui/calendar-commands.c:290
 msgid "Open calendar"
 msgstr "Obre l'agenda"
 
-#: calendar/gui/calendar-commands.c:299
+#: calendar/gui/calendar-commands.c:332
 msgid "Save calendar"
 msgstr "Desa l'agenda"
 
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:468
 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:360 calendar/gui/calendar-model.c:895
+#: calendar/gui/e-calendar-table.c:330
 msgid "Public"
 msgstr "P�blic"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
+#: calendar/gui/e-calendar-table.c:331
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
+#: calendar/gui/e-calendar-table.c:332
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: 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:200
+#: 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
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: 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:351
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
 msgid "High"
 msgstr "Alta"
 
-#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
-#: calendar/gui/calendar-model.c:1596
+#: 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:352
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: 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:353
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
 msgid "Low"
 msgstr "Baixa"
 
-#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
+#: calendar/gui/e-calendar-table.c:406
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
+#: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
 msgstr "Opac"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: 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:425
+#: calendar/gui/e-calendar-table.c:426
 msgid "Not Started"
 msgstr "No iniciat"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: 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:426
+#: calendar/gui/e-calendar-table.c:427
 msgid "In Progress"
 msgstr "En proc�s"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: 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:427
+#: calendar/gui/e-calendar-table.c:428
 #, fuzzy
 msgid "Completed"
 msgstr "% comp_let:"
 
-#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: 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:428
+#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
+#: camel/camel-service.c:586
 #, fuzzy
 msgid "Cancelled"
 msgstr "Cancel�lat"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
 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:800 e-util/e-time-utils.c:285
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:805
+#: calendar/gui/calendar-model.c:799
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1547,24 +1665,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:885
+#: calendar/gui/calendar-model.c:879
 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:756
-#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
-#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
-#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
-#: 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: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
 msgid "None"
 msgstr "Cap"
 
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:967
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1574,40 +1691,40 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1013
+#: calendar/gui/calendar-model.c:1007
 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:1054
+#: calendar/gui/calendar-model.c:1048
 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/calendar-model.c:1061
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:355
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1108
+#: calendar/gui/calendar-model.c:1102
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1598
+#: calendar/gui/calendar-model.c:1571
 #, fuzzy
 msgid "Recurring"
 msgstr "Recurr�ncia"
 
-#: calendar/gui/calendar-model.c:1600
+#: calendar/gui/calendar-model.c:1573
 #, fuzzy
 msgid "Assigned"
 msgstr "Assigna una puntuaci�"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 #, fuzzy
 msgid "No"
 msgstr "Ara"
@@ -1680,25 +1797,25 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:73
+#: calendar/gui/alarm-notify/notify-main.c:77
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+#: 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-notify-dialog.c:191
+#: 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-notify-dialog.c:202
+#: calendar/gui/dialogs/alarm-notify-dialog.c:207
 msgid "No summary available."
 msgstr "No hi ha cap resum disponible."
 
@@ -1788,7 +1905,7 @@ msgid "Display options"
 msgstr "Opcions de visualitzaci�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:162
 msgid "Due Date"
 msgstr "Data de venciment"
 
@@ -1809,7 +1926,7 @@ msgid "Fri"
 msgstr "dv."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
 msgid "Friday"
 msgstr "Divendres"
 
@@ -1838,7 +1955,7 @@ msgid "Mon"
 msgstr "dl."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
 msgid "Monday"
 msgstr "Dilluns"
 
@@ -1851,11 +1968,12 @@ 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:34
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:165
 msgid "Priority"
 msgstr "Prioritat"
 
@@ -1873,7 +1991,7 @@ msgid "Sat"
 msgstr "ds."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:482
 msgid "Saturday"
 msgstr "Dissabte"
 
@@ -1899,7 +2017,7 @@ msgid "Sun"
 msgstr "dg."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:483
 msgid "Sunday"
 msgstr "Diumenge"
 
@@ -1912,7 +2030,7 @@ msgid "Thu"
 msgstr "dj."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
 msgid "Thursday"
 msgstr "Dijous"
 
@@ -1933,7 +2051,7 @@ msgid "Tue"
 msgstr "dm."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
 msgid "Tuesday"
 msgstr "Dimarts"
 
@@ -1946,7 +2064,7 @@ msgid "Wed"
 msgstr "dc."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
 msgid "Wednesday"
 msgstr "Dimecres"
 
@@ -1959,46 +2077,46 @@ 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:84
+#: mail/mail-config.glade.h:78
 msgid "seconds."
 msgstr "segons."
 
-#: calendar/gui/dialogs/delete-comp.c:68
+#: calendar/gui/dialogs/delete-comp.c:70
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:73
 #, fuzzy
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:77
+#: calendar/gui/dialogs/delete-comp.c:79
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:82
 #, fuzzy
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:86
+#: calendar/gui/dialogs/delete-comp.c:88
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:89
+#: calendar/gui/dialogs/delete-comp.c:91
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
@@ -2015,7 +2133,7 @@ msgid "% Comp_lete:"
 msgstr "% comp_let:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:158
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Classificaci�"
@@ -2086,318 +2204,332 @@ msgstr "_Prioritat:"
 msgid "_Status:"
 msgstr "_Estat:"
 
-#: calendar/gui/dialogs/task-editor.c:689
+#: calendar/gui/dialogs/task-editor.c:697
 msgid "Edit Task"
 msgstr "Edita la tasca"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
+#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
 msgid "No summary"
 msgstr "Sense resum"
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
+#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
 #, c-format
 msgid "Task - %s"
 msgstr "Tasca - %s"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
+#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada al diari - %s"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:157
 #, fuzzy
 msgid "Categories"
 msgstr "categories"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:159
 #, fuzzy
 msgid "Completion Date"
 msgstr "Completat"
 
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:160
 #, fuzzy
 msgid "End Date"
 msgstr "Hora de _finalitzaci�:"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:161
 #, fuzzy
 msgid "Start Date"
 msgstr "Data d'ini_ci:"
 
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:163
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:164
 #, fuzzy
 msgid "Percent complete"
 msgstr "Marca la tasca com a completa"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:166
 #, fuzzy
 msgid "Summary"
 msgstr "R_esum"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:167
 #, fuzzy
 msgid "Transparency"
 msgstr "Transparent"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:168
 #, fuzzy
 msgid "URL"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/e-calendar-table.c:169
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.c:169
+#: calendar/gui/e-calendar-table.c:170
 #, fuzzy
 msgid "Click here to add a task"
 msgstr "Feu clic aqu� per a la llibreta d'adreces"
 
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:374
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:375
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:376
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:377
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:378
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:379
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:380
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:381
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:382
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:383
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:384
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:550
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:551
+#: calendar/gui/e-calendar-table.c:552
 msgid "Mark the task complete"
 msgstr "Marca la tasca com a completa"
 
-#: calendar/gui/e-calendar-table.c:556
+#: calendar/gui/e-calendar-table.c:557
 #, fuzzy
 msgid "Edit this task..."
 msgstr "Edita aquest element..."
 
-#: calendar/gui/e-calendar-table.c:557
+#: calendar/gui/e-calendar-table.c:558
 #, fuzzy
 msgid "Edit the task"
 msgstr "Edita la tasca"
 
-#: calendar/gui/e-calendar-table.c:559
+#: calendar/gui/e-calendar-table.c:560
 #: ui/evolution-task-editor-dialog.xml.h:19
 #, fuzzy
 msgid "Delete this task"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-calendar-table.c:560
+#: calendar/gui/e-calendar-table.c:561
 msgid "Delete the task"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisions de minut"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
-#: calendar/gui/e-week-view-main-item.c:321
+#: 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"
 
 #. 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:1288
-#: calendar/gui/e-week-view-main-item.c:330
+#: 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:279 calendar/gui/e-day-view.c:1301
-#: calendar/gui/e-week-view-main-item.c:344
+#: 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"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:613
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:617
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
-#: calendar/gui/print.c:612
+#: 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-day-view.c:3020 calendar/gui/e-day-view.c:3034
-#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
+#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "New Appointment..."
+msgid "New Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
-#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
+#, fuzzy
+msgid "New All Day Event"
+msgstr "Esdeveniment per a _tot el dia"
+
+#: 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/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#, fuzzy
+msgid "Go to Date..."
+msgstr "V�s a una 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
 #, fuzzy
 msgid "Open"
 msgstr "_Obre"
 
-#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+#: 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/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: 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/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
 #, fuzzy
 msgid "Make this Occurrence Movable"
 msgstr "Fes aquesta cita movible"
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Suprimeix-ne aquesta aparici�"
 
-#: calendar/gui/e-day-view.c:3047
+#: calendar/gui/e-day-view.c:3179
 #, fuzzy
 msgid "Delete all Occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
 
-#: calendar/gui/e-itip-control.c:153
+#: 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/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
+#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
 #, fuzzy
 msgid "Component successfully updated."
 msgstr "Els fitxers de l'Evolution s'han instal�lat amb �xit."
 
-#: calendar/gui/e-itip-control.c:165
+#: calendar/gui/e-itip-control.c:173
 msgid "There was an error loading the calendar file."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:189
+#: calendar/gui/e-itip-control.c:197
 msgid "I couldn't open your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
+#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
 msgid "I couldn't load your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:462
+#: calendar/gui/e-itip-control.c:470
 #, 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:475
+#: calendar/gui/e-itip-control.c:483
 msgid "This is a reply from someone who was uninvited!"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:491
+#: calendar/gui/e-itip-control.c:499
 #, fuzzy
 msgid "I couldn't update your calendar store."
 msgstr "No s'ha pogut crear una agenda a `%s'"
 
-#: calendar/gui/e-itip-control.c:532
+#: calendar/gui/e-itip-control.c:540
 msgid "I couldn't delete the calendar component!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:542
+#: calendar/gui/e-itip-control.c:550
 #, fuzzy
 msgid "Component successfully deleted."
 msgstr "Els fitxers de l'Evolution s'han instal�lat amb �xit."
 
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:694
 #, 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"
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:780
 #, fuzzy
 msgid "Add to Calendar"
 msgstr "Sobre l'agenda"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:814
 #, fuzzy
-msgid "Accept"
+msgid " Accept "
 msgstr "set"
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:815
 #, fuzzy
-msgid "Decline"
+msgid " Decline "
 msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
+#: calendar/gui/e-itip-control.c:816
+#, fuzzy
+msgid " Tentative "
 msgstr "Tentatiu"
 
-#: calendar/gui/e-itip-control.c:852
+#: calendar/gui/e-itip-control.c:860
 #, fuzzy
 msgid "Update Calendar"
 msgstr "_Obre una agenda"
 
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:883
 #, fuzzy
 msgid "Cancel Meeting"
 msgstr "Cancel�lat"
@@ -2416,7 +2548,7 @@ msgstr ""
 msgid "Calendar Message"
 msgstr "Agenda"
 
-#: calendar/gui/e-itip-control.glade.h:5
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
 #, fuzzy
 msgid "Date:"
 msgstr "Data de venciment"
@@ -2431,9 +2563,10 @@ msgstr "Imprimeix l'agenda"
 msgid "Organizer:"
 msgstr "Organitzaci�:"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
-msgid "Sender"
-msgstr "Remitent"
+#: calendar/gui/e-itip-control.glade.h:10
+#, fuzzy
+msgid "Server Message:"
+msgstr "Anomena i desa..."
 
 #: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
@@ -2525,28 +2658,28 @@ msgid ""
 "Time"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
-#: mail/message-list.c:1171
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
+#: mail/message-list.c:1052
 #, fuzzy
 msgid "Status"
 msgstr "_Estat:"
 
-#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
-#: calendar/gui/e-tasks.c:501
+#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
+#: calendar/gui/e-tasks.c:502
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:154
+#: calendar/gui/e-tasks.c:155
 #, fuzzy
 msgid "Category:"
 msgstr "categories"
 
-#: calendar/gui/e-tasks.c:297
+#: 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/e-tasks.c:309
+#: 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"
@@ -2554,11 +2687,16 @@ msgstr "El m�tode necessari per carregar `%s' no est� suportat"
 #. 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
+#: calendar/gui/e-week-view-main-item.c:342
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3255
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+#, fuzzy
+msgid "New Appointment..."
+msgstr "Nova cita..."
+
+#: calendar/gui/e-week-view.c:3314
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
@@ -2597,7 +2735,7 @@ msgid "No recurrence"
 msgstr "Sense recurr�ncia"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1577
+#: calendar/gui/event-editor.c:1579
 msgid "Play a sound"
 msgstr ""
 
@@ -2619,24 +2757,24 @@ msgid "Reminder"
 msgstr "Recordatori"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1586
+#: calendar/gui/event-editor.c:1588
 #, fuzzy
 msgid "Run a program"
 msgstr "_Executa el programa:"
 
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1583
+#: calendar/gui/event-editor.c:1585
 #, fuzzy
 msgid "Send an email"
 msgstr "S'est� recollint el correu des de %s"
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
 #, fuzzy
 msgid "Settings..."
 msgstr "_Par�metres"
 
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1580
+#: calendar/gui/event-editor.c:1582
 #, fuzzy
 msgid "Show a dialog"
 msgstr "Mostra 1 dia"
@@ -2658,12 +2796,11 @@ msgstr "Hora d'_inici:"
 msgid "_Starting date:"
 msgstr "Data d'_inici:"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
 msgid "after"
 msgstr "despr�s de"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
 msgid "before"
 msgstr "abans de"
 
@@ -2689,7 +2826,7 @@ msgstr "per sempre"
 msgid "hour(s)"
 msgstr "hores"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
 #, fuzzy
 msgid "minute(s)"
 msgstr "minuts"
@@ -2715,109 +2852,109 @@ msgstr "setmana(es)"
 msgid "year(s)"
 msgstr "any(s)"
 
-#: calendar/gui/event-editor.c:371
+#: calendar/gui/event-editor.c:373
 msgid "Edit Appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/event-editor.c:449
+#: calendar/gui/event-editor.c:451
 msgid "on"
 msgstr "el"
 
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
 msgid "day"
 msgstr "dia"
 
-#: calendar/gui/event-editor.c:601
+#: calendar/gui/event-editor.c:603
 #, fuzzy
 msgid "on the"
 msgstr "mes"
 
-#: calendar/gui/event-editor.c:608
+#: calendar/gui/event-editor.c:610
 #, fuzzy
 msgid "th"
 msgstr "4"
 
-#: calendar/gui/event-editor.c:754
+#: calendar/gui/event-editor.c:756
 #, fuzzy
 msgid "occurrences"
 msgstr "aparicions"
 
-#: calendar/gui/event-editor.c:871
+#: calendar/gui/event-editor.c:873
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1532
+#: calendar/gui/event-editor.c:1534
 #, fuzzy, c-format
 msgid " %d days"
 msgstr "dies"
 
-#: calendar/gui/event-editor.c:1534
+#: calendar/gui/event-editor.c:1536
 #, fuzzy
 msgid " 1 day"
 msgstr "Mostra 1 dia"
 
-#: calendar/gui/event-editor.c:1537
+#: calendar/gui/event-editor.c:1539
 #, fuzzy, c-format
 msgid " %d weeks"
 msgstr "setmanes"
 
-#: calendar/gui/event-editor.c:1539
+#: calendar/gui/event-editor.c:1541
 #, fuzzy
 msgid " 1 week"
 msgstr "Mostra 1 setmana"
 
-#: calendar/gui/event-editor.c:1542
+#: calendar/gui/event-editor.c:1544
 #, fuzzy, c-format
 msgid " %d hours"
 msgstr "hores"
 
-#: calendar/gui/event-editor.c:1544
+#: calendar/gui/event-editor.c:1546
 #, fuzzy
 msgid " 1 hour"
 msgstr "hora"
 
-#: calendar/gui/event-editor.c:1547
+#: calendar/gui/event-editor.c:1549
 #, fuzzy, c-format
 msgid " %d minutes"
 msgstr "minuts"
 
-#: calendar/gui/event-editor.c:1549
+#: calendar/gui/event-editor.c:1551
 #, fuzzy
 msgid " 1 minute"
 msgstr "10 minuts"
 
-#: calendar/gui/event-editor.c:1552
+#: calendar/gui/event-editor.c:1554
 #, fuzzy, c-format
 msgid " %d seconds"
 msgstr " segons"
 
-#: calendar/gui/event-editor.c:1554
+#: calendar/gui/event-editor.c:1556
 #, fuzzy
 msgid " 1 second"
 msgstr " segons"
 
-#: calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1603
 #, fuzzy
 msgid " before start of appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/event-editor.c:1603
+#: calendar/gui/event-editor.c:1605
 #, fuzzy
 msgid " after start of appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/event-editor.c:1611
+#: calendar/gui/event-editor.c:1613
 #, fuzzy
 msgid " before end of appointment"
 msgstr "Recorda'm totes les cites"
 
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/event-editor.c:1615
 #, fuzzy
 msgid " after end of appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
-#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
+#: 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"
 
@@ -2860,14 +2997,14 @@ msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 msgid "Factory for the sample Calendar control"
 msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: calendar/gui/gnome-cal.c:695
+#: calendar/gui/gnome-cal.c:700
 #, 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:706
+#: calendar/gui/gnome-cal.c:711
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El m�tode necessari per carregar `%s' no est� suportat"
@@ -2942,201 +3079,201 @@ msgstr "octubre"
 msgid "September"
 msgstr "setembre"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:306
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Su"
 msgstr "Dg"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Mo"
 msgstr "Dl"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Tu"
 msgstr "Dm"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "We"
 msgstr "Dc"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Th"
 msgstr "Dj"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Fr"
 msgstr "Dv"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Sa"
 msgstr "Ds"
 
-#: calendar/gui/print.c:944
+#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tasques"
 
 #. Day
-#: calendar/gui/print.c:1074
+#: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
 msgstr "Avui (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1089
+#: calendar/gui/print.c:1093
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1104
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Aquesta setmana (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1108
+#: calendar/gui/print.c:1112
 msgid "Current month (%b %Y)"
 msgstr "Aquest mes (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1115
+#: calendar/gui/print.c:1119
 msgid "Current year (%Y)"
 msgstr "Enguany (%Y)"
 
-#: calendar/gui/print.c:1152
+#: calendar/gui/print.c:1156
 msgid "Print Calendar"
 msgstr "Imprimeix l'agenda"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:32
+#: 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
 msgid "Print Preview"
 msgstr "Previsualitzaci� d'impressi�"
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/tasks-control.c:108
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrar� l'agenda"
@@ -3169,27 +3306,102 @@ 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
 #, fuzzy
 msgid "SMTWTFS"
 msgstr "DDDDDDD"
 
-#: camel/camel-filter-driver.c:790
+#: camel/camel-cipher-context.c:169
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, fuzzy
+msgid "Syncing folders"
+msgstr "S'est� sincronitzant \"%s\""
+
+#: camel/camel-filter-driver.c:643
+#, fuzzy
+msgid "Unable to open spool folder"
+msgstr "No es pot obrir la llibreta d'adreces"
+
+#: camel/camel-filter-driver.c:652
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Failed message %d"
+msgstr "Missatge de _correu (FIXME)"
+
+#: camel/camel-filter-driver.c:671
+#, 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
+#, 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
+#, 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
+#, 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
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:795
+#: camel/camel-filter-driver.c:871
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-folder-search.c:323
+#: camel/camel-folder-search.c:328
 #, fuzzy, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3198,7 +3410,7 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:338
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3207,158 +3419,230 @@ msgstr ""
 "Error en preparar-se per a %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 ""
 
 #. 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 camel/camel-movemail.c:138
+#: camel/camel-movemail.c:185
 #, 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:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151 camel/camel-movemail.c:219
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "S'ha excedit el temps m�xim en intentar recuperar el fitxer de blocatge en "
 "%s. Torneu-ho a provar m�s tard."
 
-#: camel/camel-lock.c: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:101
 #, 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:146
+#: camel/camel-movemail.c:148
 #, 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:156
+#: camel/camel-movemail.c:158
 #, 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:197
+#: 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:243
+#: 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:254
+#: 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:272
+#: camel/camel-movemail.c:274
 #, 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:304
+#: camel/camel-movemail.c:306
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:318
 #, c-format
 msgid "Could not fork: %s"
 msgstr "No s'ha pogut bifurcar: %s"
 
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:356
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "El programa Movemail ha fallat: %s"
 
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:357
 msgid "(Unknown error)"
 msgstr "(Error desconegut)"
 
-#: camel/camel-provider.c:137
+#: camel/camel-movemail.c:587
+#, 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
+#, 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
+#, 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
+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
+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
+#, 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
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:871
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:888
+#, 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
+msgid "No plaintext to encrypt."
+msgstr ""
+
+#: camel/camel-pgp-context.c:1037
+msgid "No recipients specified"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1227
+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 "No s'ha pogut carregar %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 ""
 "No s'ha pogut carregar %s: el m�dul no cont� cap codi d'inicialitzaci�."
 
-#: camel/camel-remote-store.c:181
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s server %s"
 msgstr "Servidor %s %s"
 
-#: camel/camel-remote-store.c:185
+#: camel/camel-remote-store.c:190
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "Servei %s per a %s en %s"
 
-#: camel/camel-remote-store.c:232
+#: camel/camel-remote-store.c:240
 #, fuzzy
 msgid "Connection cancelled"
 msgstr "Cancel�lat"
 
-#: camel/camel-remote-store.c:235
-#: camel/providers/smtp/camel-smtp-transport.c:244
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:261
 #, 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:236
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(ordinador central desconegut)"
 
-#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
-#: camel/camel-remote-store.c:448
-#: camel/providers/imap/camel-imap-command.c:289
+#: 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
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Obre l'agenda"
 
-#: camel/camel-remote-store.c:453
+#: camel/camel-remote-store.c:464
 #, fuzzy
 msgid "Server unexpectedly disconnected"
 msgstr "El servidor ha rebutjat el nom d'usuari"
 
-#: 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 ""
+"Aquesta opci� es connectar� al servidor IMAP mitjan�ant una contrasenya de "
+"text net."
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autenticaci�:"
 
-#: 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
 #, fuzzy, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -3367,7 +3651,7 @@ msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:130
+#: camel/camel-sasl-anonymous.c:143
 #, fuzzy, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -3376,11 +3660,11 @@ msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+#: 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
 #, fuzzy
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
@@ -3389,11 +3673,11 @@ msgstr ""
 "Aix� us connectar� al servidor POP i utilitzar� el Kerberos 4 per "
 "autenticar-vos-hi."
 
-#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+#: 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
 #, fuzzy
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
@@ -3402,113 +3686,117 @@ msgstr ""
 "Aquesta opci� es connectar� al servidor IMAP mitjan�ant una contrasenya de "
 "text net."
 
-#: 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
 #, fuzzy
 msgid "Server response did not contain authorization data\n"
 msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
 
-#: 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
 #, fuzzy
 msgid "Server response does not match\n"
 msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
 
-#: 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
 #, fuzzy
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "Aix� us connectar� al servidor POP i utilitzar� el Kerberos 4 per "
 "autenticar-vos-hi."
 
-#: camel/camel-sasl-kerberos4.c:158
+#: camel/camel-sasl-kerberos4.c:161
 #, fuzzy, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:381
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:417
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/camel-sasl-plain.c:29
-msgid "PLAIN"
-msgstr ""
-
-#: camel/camel-sasl-plain.c:31
+#: camel/camel-sasl-plain.c:34
 #, fuzzy
-msgid ""
-"This option will connect to the server using a the PLAIN SASL mechanism if "
-"the server supports it."
+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:105
+#: camel/camel-search-private.c:110
 #, 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:142
+#: camel/camel-service.c:152
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL '%s' necessita un component de nom d'usuari"
 
-#: camel/camel-service.c:151
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL '%s' necessita un component d'ordinador central"
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:168
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL '%s' necessita un component de cam�"
 
-#: camel/camel-service.c:512
+#: camel/camel-service.c:554
+#, fuzzy, c-format
+msgid "Resolving: %s"
+msgstr "S'est� comprovant \"%s\""
+
+#: camel/camel-service.c:581
 #, c-format
-msgid "No such host %s."
-msgstr "L'ordinador central %s no existeix."
+msgid "Failure in name lookup: %s"
+msgstr ""
 
-#: camel/camel-service.c:515
+#: camel/camel-service.c:606
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Temporalment no es pot cercar el nom d'ordinador central %s."
+msgid "Host lookup failed: %s: host not found"
+msgstr ""
+
+#: camel/camel-service.c:608
+#, c-format
+msgid "Host lookup failed: %s: unknown reason"
+msgstr ""
 
-#: camel/camel-session.c:54
+#: camel/camel-session.c:57
 msgid "Virtual folder email provider"
 msgstr "Prove�dor de correu de la carpeta virtual"
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:59
 msgid "For reading mail as a query of another set of folders"
 msgstr "Per llegir correu com a consulta d'un altre joc de carpetes"
 
-#: camel/camel-session.c:322
+#: camel/camel-session.c:274 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:417
+#: camel/camel-session.c:462
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3518,124 +3806,151 @@ msgstr ""
 "%s"
 
 #. Fill in the new fields
-#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
-#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#: 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
 #, fuzzy
 msgid "Trash"
 msgstr "Tasca"
 
-#: camel/camel-url.c:77
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "La cadena d'URL `%s' no cont� cap protocol"
-
-#: camel/camel-url.c:92
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "La cadena d'URL `%s' cont� un protocol incorrecte"
+#: camel/camel-url.c:289
+#, fuzzy, c-format
+msgid "Could not parse URL `%s'"
+msgstr ""
+"No s'ha pogut obrir el fitxer `%s':\n"
+"%s"
 
-#: camel/camel-url.c:152
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "El n�mero de port de l'URL `%s' no �s num�ric"
+#: camel/camel-vee-folder.c:451
+#, fuzzy, c-format
+msgid "No such message %s in %s"
+msgstr "L'ordinador central %s no existeix."
 
-#: camel/camel-vee-folder.c:960
+#: camel/camel-vee-folder.c:545
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:209
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:217
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "L'ordre IMAP ha fallat: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
+#: 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:297
+#: camel/providers/imap/camel-imap-command.c:272
 #, 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:433
+#: camel/providers/imap/camel-imap-command.c:456
 #, 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:469
+#: camel/providers/imap/camel-imap-command.c:490
 #, 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:199
+#: camel/providers/imap/camel-imap-folder.c:172
 #, 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:329
+#: camel/providers/imap/camel-imap-folder.c:351
 #, fuzzy
 msgid "Scanning IMAP folder"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: camel/providers/imap/camel-imap-folder.c:837
-#: camel/providers/imap/camel-imap-folder.c:999
+#: camel/providers/imap/camel-imap-folder.c:986
+#: camel/providers/imap/camel-imap-folder.c:1197
+#, 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
 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:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Checking for new mail"
+msgstr "Comprova si hi ha nou correu"
 
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+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
+msgid "Folders"
+msgstr "Carpetes"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:50
 #, fuzzy
-msgid "Secure IMAPv4"
-msgstr "IMAPv4"
+msgid "Show only subscribed folders"
+msgstr "Escaneja les carpetes de \"%s\""
+
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Override server-supplied folder namespace"
+msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap/camel-imap-provider.c:54
 #, fuzzy
-msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgid "Namespace"
+msgstr "Nom:"
+
+#: 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:65
+msgid "For reading and storing mail on IMAP servers."
 msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:263
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Aquesta opci� es connectar� al servidor IMAP mitjan�ant una contrasenya de "
 "text net."
 
-#: camel/providers/imap/camel-imap-store.c:415
+#: camel/providers/imap/camel-imap-store.c:440
 #, 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:426
+#: camel/providers/imap/camel-imap-store.c:450
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autenticaci�:"
 
-#: camel/providers/imap/camel-imap-store.c:454
+#: camel/providers/imap/camel-imap-store.c:475
 #, 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:469
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:403
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:498
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: camel/providers/imap/camel-imap-store.c:518
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3646,92 +3961,101 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:772
+#: camel/providers/imap/camel-imap-store.c:865
+#, 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"
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/imap/camel-imap-store.c:1382
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:39
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "Directoris de correu en format MH d'UNIX"
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:40
 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:47
+#: camel/providers/local/camel-local-provider.c:49
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:50
 #, 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:58
+#: camel/providers/local/camel-local-provider.c:59
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 #, 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:128
+#: camel/providers/local/camel-local-store.c:129
 #, 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:136
 #, 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:143
-#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:144
+#: camel/providers/local/camel-local-store.c:160
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:175
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fitxer de correu local %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:241
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:283
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:293
 #, 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:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
+#: camel/providers/local/camel-maildir-folder.c:150
+#: camel/providers/local/camel-maildir-folder.c:158
+#: camel/providers/local/camel-maildir-folder.c:169
 #, 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: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: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
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3740,20 +4064,20 @@ msgstr ""
 "No es pot recuperar el missatge: %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:197
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
 #, fuzzy
 msgid "No such message"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:203
 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:96
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -3762,15 +4086,15 @@ msgstr ""
 "No s'ha pogut obrir la carpeta `%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:100
+#: 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:105
-#: camel/providers/local/camel-mh-store.c:101
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3779,36 +4103,41 @@ msgstr ""
 "No s'ha pogut crear la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:120
+#: camel/providers/local/camel-maildir-store.c:122
 #, fuzzy, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' no �s un directori."
 
-#: 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:151
+#: camel/providers/local/camel-maildir-store.c:188
+#: 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:150
+#: camel/providers/local/camel-maildir-store.c:152
 #, fuzzy
 msgid "not a maildir directory"
 msgstr "Directori de correu local %s"
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:152
+#, 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
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "No es pot obrir la b�stia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "No es pot afegir el missatge al fitxer mbox: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:335
+#: camel/providers/local/camel-mbox-folder.c:367
+#: camel/providers/local/camel-mbox-folder.c:380
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3817,15 +4146,15 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:368
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:381
 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"
@@ -3834,7 +4163,7 @@ msgstr ""
 "No s'ha pogut obrir el fitxer `%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"
@@ -3843,14 +4172,14 @@ msgstr ""
 "No s'ha pogut crear el fitxer `%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' no �s un fitxer habitual."
 
-#: 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"
@@ -3859,116 +4188,116 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%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 "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:240
+#: camel/providers/local/camel-mbox-summary.c:248
 #, fuzzy
 msgid "Summarising folder"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:245
+#: camel/providers/local/camel-mbox-summary.c:253
 #, 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:287
+#: camel/providers/local/camel-mbox-summary.c:295
 #, 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:370
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
+#: camel/providers/local/camel-mbox-summary.c:501
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:506
+#: camel/providers/local/camel-mbox-summary.c:707
 #, 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:515
+#: camel/providers/local/camel-mbox-summary.c:523
 #, 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:540
 #: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:556
 #: camel/providers/local/camel-mbox-summary.c:745
+#: camel/providers/local/camel-mbox-summary.c:753
 #, 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:591
+#: camel/providers/local/camel-mbox-summary.c:599
 #, 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:608
+#: camel/providers/local/camel-mbox-summary.c:616
 #, 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:626
-#: camel/providers/local/camel-mbox-summary.c:795
+#: camel/providers/local/camel-mbox-summary.c:634
+#: camel/providers/local/camel-mbox-summary.c:803
 #, 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:635
+#: camel/providers/local/camel-mbox-summary.c:643
 #, 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:646
+#: camel/providers/local/camel-mbox-summary.c:654
 #, 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:870
+#: camel/providers/local/camel-mbox-summary.c:878
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:149
+#: camel/providers/local/camel-mh-folder.c:157
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 
-#: camel/providers/local/camel-mh-store.c:108
+#: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' no �s un directori."
 
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: 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:62
+#: camel/providers/nntp/camel-nntp-auth.c:66
 msgid "Server rejected username"
 msgstr "El servidor ha rebutjat el nom d'usuari"
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:72
 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:77
+#: camel/providers/nntp/camel-nntp-auth.c:81
 msgid "Server rejected username/password"
 msgstr "El servidor ha rebutjat el nom d'usuari/la contrasenya"
 
@@ -3992,11 +4321,11 @@ msgstr "No es pot carregar el fitxer de llista de grups per a %s: %s"
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr "Not�cies d'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 "Prove�dor per llegir i publicar als grups de not�cies d'USENET."
 
@@ -4024,35 +4353,50 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "No es pot obrir o crear el fitxer .newsrc per a %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:145
+#: camel/providers/pop3/camel-pop3-folder.c:149
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:188
+#: camel/providers/pop3/camel-pop3-folder.c:192
 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:282
+#: camel/providers/pop3/camel-pop3-folder.c:285
 #, 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:286
+#: camel/providers/pop3/camel-pop3-folder.c:289
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:304
+#: camel/providers/pop3/camel-pop3-folder.c:307
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
 
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
+#, fuzzy
+msgid "Message storage"
+msgstr "Cos del missatge"
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+#, fuzzy
+msgid "Leave messages on server"
+msgstr "No suprimeixis els missatges del servidor"
+
+#: camel/providers/pop3/camel-pop3-provider.c:41
+#, fuzzy, c-format
+msgid "Delete after %s day(s)"
+msgstr "Suprimeix la tasca"
+
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
 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."
@@ -4061,22 +4405,7 @@ msgstr ""
 "recuperar correu des de determinats prove�dors de correu web i sistemes "
 "propietaris de correu."
 
-#: camel/providers/pop3/camel-pop3-provider.c:54
-msgid "Secure POP"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:56
-#, fuzzy
-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 ""
-"Per connectar als servidors POP. El protocol POP tamb� es pot utilitzar per "
-"recuperar correu des de determinats prove�dors de correu web i sistemes "
-"propietaris de correu."
-
-#: camel/providers/pop3/camel-pop3-store.c:147
+#: 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."
@@ -4084,7 +4413,7 @@ msgstr ""
 "Aquesta opci� us connectar� al sevidor POP mitjan�ant una contrasenya en "
 "text net. �s l'�nica suportada per molts servidors POP."
 
-#: camel/providers/pop3/camel-pop3-store.c:157
+#: 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 "
@@ -4094,29 +4423,29 @@ msgstr ""
 "xifrada mitjan�ant el protocol APOP. Aix� no funcionar� per a tots els "
 "usuaris, fins i tot en servidors que diuen que ho suporten."
 
-#: camel/providers/pop3/camel-pop3-store.c:169
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Aix� us connectar� al servidor POP i utilitzar� el Kerberos 4 per "
 "autenticar-vos-hi."
 
-#: camel/providers/pop3/camel-pop3-store.c:214
+#: camel/providers/pop3/camel-pop3-store.c:207
 #, 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:331
+#: camel/providers/pop3/camel-pop3-store.c:319
 #, 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:378
+#: camel/providers/pop3/camel-pop3-store.c:358
 #, 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:397
+#: camel/providers/pop3/camel-pop3-store.c:377
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4125,12 +4454,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:400
-#: camel/providers/pop3/camel-pop3-store.c:437
+#: camel/providers/pop3/camel-pop3-store.c:380
+#: camel/providers/pop3/camel-pop3-store.c:417
 msgid "(Unknown)"
 msgstr "(Desconegut)"
 
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:407
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4138,7 +4467,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:435
+#: camel/providers/pop3/camel-pop3-store.c:415
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4147,17 +4476,17 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar la contrasenya: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:57
 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."
@@ -4165,359 +4494,353 @@ msgstr ""
 "Per lliurar correu transferint-lo al programa \"sendmail\" en el 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 ""
 "No s'ha pogut crear el conducte al sendmail: %s: no s'ha enviat el correu"
 
-#: 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 "No s'ha pogut bifurcar el sendmail: %s: no s'ha enviat el correu"
 
-#: 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 "No s'ha pogut enviar el missatge: %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 "El sendmail ha acabat amb el senyal %s: no s'ha enviat el correu."
 
-#: 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 "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: 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 "El sendmail ha acabat amb l'estat %d: no s'ha enviat el correu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
 #, fuzzy
 msgid "Could not find 'From' address in message"
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c: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 "Lliurament de correu mitjan�ant el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
 msgid "SMTP"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:36
+#: camel/providers/smtp/camel-smtp-provider.c:40
 #, fuzzy
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Per al lliurament de correu mitjan�ant la connexi� a un concentrador de "
 "correu utilitzant SMTP."
 
-#: camel/providers/smtp/camel-smtp-provider.c:53
-msgid "Secure SMTP"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-provider.c:55
-#, fuzzy
-msgid ""
-"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
-"connection.\n"
-msgstr ""
-"Per al lliurament de correu mitjan�ant la connexi� a un concentrador de "
-"correu utilitzant SMTP."
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:175
 #, fuzzy
 msgid "Help message"
 msgstr "Mou el missatge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:177
 #, fuzzy
 msgid "Service ready"
 msgstr "Amaga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:207
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "No s'ha indicat cap contrasenya."
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:211
 #, 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:195
+#: camel/providers/smtp/camel-smtp-transport.c:213
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:215
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:286
+#: camel/providers/smtp/camel-smtp-transport.c:305
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:348
+#, 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
 #, 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:466
-#, fuzzy
-msgid "No authentication required"
-msgstr "Autenticaci�:"
-
-#: camel/providers/smtp/camel-smtp-transport.c:468
-#, fuzzy
+#: camel/providers/smtp/camel-smtp-transport.c:411
+#, fuzzy, c-format
 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."
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
 msgstr ""
-"Aquesta opci� us connectar� al sevidor POP mitjan�ant una contrasenya en "
-"text net. �s l'�nica suportada per molts servidors POP."
+"No es pot autenticar davant del servidor IMAP.\n"
+"%s\n"
+"\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:511
+#: camel/providers/smtp/camel-smtp-transport.c:527
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Servidor %s %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:529
 #, 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:538
+#: camel/providers/smtp/camel-smtp-transport.c:554
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:561
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:559
+#: camel/providers/smtp/camel-smtp-transport.c:575
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
-#: camel/providers/smtp/camel-smtp-transport.c:719
+#: camel/providers/smtp/camel-smtp-transport.c:721
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:736
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, 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:777
+#: camel/providers/smtp/camel-smtp-transport.c:798
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:824
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:821
+#: camel/providers/smtp/camel-smtp-transport.c:843
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:846
+#: camel/providers/smtp/camel-smtp-transport.c:868
 #, 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:865
+#: camel/providers/smtp/camel-smtp-transport.c:887
 #, 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:896
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, 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:915
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, 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:930
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:952
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:967
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:1013
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1010
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1033
+#: camel/providers/smtp/camel-smtp-transport.c:1055
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1052
+#: camel/providers/smtp/camel-smtp-transport.c:1074
 #, 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:95
 msgid "1 byte"
 msgstr "1 octet"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:97
 #, c-format
 msgid "%u bytes"
 msgstr "%u octets"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:112
 #, 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:113
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
 msgid "attachment"
 msgstr "adjunci�"
 
-#: composer/e-msg-composer-attachment-bar.c:413
+#: 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:461
+#: composer/e-msg-composer-attachment-bar.c:469
 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:492
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Add attachment..."
 msgstr "Afegeix una adjunci�..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:501
 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:1171
-#: ui/evolution-mail.xml.h:1
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
 #, fuzzy
 msgid "Attachment"
 msgstr "adjunci�"
@@ -4544,21 +4867,21 @@ msgstr "Tipus de MIME:"
 msgid "Send as:"
 msgstr "Envia \"%s\""
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:321
 msgid "Click here for the address book"
 msgstr "Feu clic aqu� per a la llibreta d'adreces"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Respon"
@@ -4566,31 +4889,31 @@ msgstr "Respon"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
 msgid "To:"
 msgstr "Per a:"
 
-#: composer/e-msg-composer-hdrs.c:377
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Enter the recipients of the message"
 msgstr "Introdu�u els destinataris del missatge"
 
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:381
+#: composer/e-msg-composer-hdrs.c:388
 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:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:392
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4598,7 +4921,7 @@ 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:518
+#: composer/e-msg-composer.c:528
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4607,26 +4930,32 @@ msgstr ""
 "No s'ha pogut obrir el fitxer de signatura %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:706
+#: composer/e-msg-composer.c:716
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: composer/e-msg-composer.c:717
+#: composer/e-msg-composer.c:727
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:737
+#: composer/e-msg-composer.c:747
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
+#: composer/e-msg-composer.c:819
+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:824
+#: composer/e-msg-composer.c:883
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4636,27 +4965,27 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: composer/e-msg-composer.c:849
+#: composer/e-msg-composer.c:908
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: composer/e-msg-composer.c:975
+#: composer/e-msg-composer.c:1034
 msgid "That file does not exist."
 msgstr "Aquest fitxer no existeix."
 
-#: composer/e-msg-composer.c:985
+#: composer/e-msg-composer.c:1044
 msgid "That is not a regular file."
 msgstr "Aquest fitxer no �s habitual."
 
-#: composer/e-msg-composer.c:995
+#: 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:1005
+#: 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:1027
+#: composer/e-msg-composer.c:1086
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4664,25 +4993,25 @@ msgstr ""
 "El fitxer �s molt gran (m�s de 100 kB).\n"
 "Segur que voleu inserir-lo?"
 
-#: composer/e-msg-composer.c:1048
+#: 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:1349 composer/e-msg-composer.c:1681
+#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
 msgid "Compose a message"
 msgstr "Redacta un missatge"
 
-#: composer/e-msg-composer.c:1765
+#: composer/e-msg-composer.c:1829
 msgid "Could not create composer window."
 msgstr "No s'ha pogut crear la finestra del redactor."
 
-#: composer/evolution-composer.c:352
+#: 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:367
+#: composer/evolution-composer.c:370
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
@@ -4703,55 +5032,81 @@ msgid "calendar information"
 msgstr "Cap informaci�"
 
 #. 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:69 e-util/e-time-utils.c:117
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
 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:86 e-util/e-time-utils.c:197
+#: 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:89 e-util/e-time-utils.c:200
+#: 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:93 e-util/e-time-utils.c:204
+#: 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:96 e-util/e-time-utils.c:207
+#: 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:267
-#: 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:269
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
 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:272
+#: e-util/e-time-utils.c:274
 #, 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:281
+#: e-util/e-time-utils.c:283
 #, 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."
@@ -4833,7 +5188,7 @@ msgstr "V�s a l'element seg�ent"
 msgid "Configure %s"
 msgstr "_Configura la carpeta"
 
-#: executive-summary/component/e-summary.c:918
+#: executive-summary/component/e-summary.c:924
 #, fuzzy, c-format
 msgid ""
 "Cannot open the HTML file:\n"
@@ -4842,14 +5197,14 @@ msgstr ""
 "No s'ha pogut obrir el fitxer %s:\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:932
+#: 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:950
+#: executive-summary/component/e-summary.c:956
 msgid "File does not have a place for the services.\n"
 msgstr ""
 
@@ -4861,7 +5216,7 @@ msgstr ""
 msgid "Background:"
 msgstr ""
 
-#: executive-summary/component/main.c:60
+#: 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"
@@ -4895,89 +5250,89 @@ msgstr ""
 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
+#: 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:765
+#: executive-summary/test-service/rdf-summary.c:768
 msgid "Update automatically"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:775
+#: executive-summary/test-service/rdf-summary.c:778
 msgid "Update now"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:785
+#: executive-summary/test-service/rdf-summary.c:788
 #, fuzzy
 msgid "Update every "
 msgstr "_Actualitza lliure/ocupat"
 
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
+#: executive-summary/test-service/rdf-summary.c:796
+#: filter/filter-datespec.c:83
 msgid "minutes"
 msgstr "minuts"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "year"
 msgstr "any"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "years"
 msgstr "anys"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "month"
 msgstr "mes"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "months"
 msgstr "mesos"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "week"
 msgstr "setmana"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "weeks"
 msgstr "setmanes"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:81
 msgid "days"
 msgstr "dies"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hour"
 msgstr "hora"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hours"
 msgstr "hores"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:83
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "second"
 msgstr "segon"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "seconds"
 msgstr "segons"
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:199
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:201
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:275
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -4987,7 +5342,7 @@ msgstr ""
 "sigui quina sigui, en qu� s'executi el filtre\n"
 "o s'obri la vfolder."
 
-#: filter/filter-datespec.c:282
+#: filter/filter-datespec.c:298
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -4995,7 +5350,7 @@ msgstr ""
 "La data del missatge es comparar� amb l'hora\n"
 "que indiqueu aqu�."
 
-#: filter/filter-datespec.c:322
+#: filter/filter-datespec.c:338
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5006,67 +5361,64 @@ msgstr ""
 "\"fa una setmana\", per exemple."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "the current time"
 msgstr "l'hora actual"
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "a time you specify"
 msgstr "una hora que indiqueu"
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:374
 msgid "a time relative to the current time"
 msgstr "una hora relativa a l'actual"
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:432
 msgid "Compare against"
 msgstr "Compara-la amb"
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
 msgid "now"
 msgstr "ara"
 
-#: filter/filter-datespec.c:690
+#: filter/filter-datespec.c:706
 msgid "<click here to select a date>"
 msgstr "<feu clic aqu� per seleccionar una data>"
 
-#: filter/filter-editor.c:126 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "Regles del filtre"
 
 #. and now for the action area
-#: filter/filter-filter.c:424
+#: filter/filter-filter.c:453
 msgid "Then"
 msgstr "Aleshores"
 
-#: filter/filter-filter.c:437
+#: filter/filter-filter.c:467
 msgid "Add action"
 msgstr "Afegeix una acci�"
 
-#: filter/filter-filter.c:443
-msgid "Remove action"
-msgstr "Elimina una acci�"
-
-#: 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:279
+#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
+#: mail/mail-account-gui.c:682
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:247
 msgid "Enter folder URI"
 msgstr "Introdu�u l'URI de la carpeta"
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:293
 msgid "<click here to select a folder>"
 msgstr "<feu clic aqu� per seleccionar una carpeta>"
 
-#: filter/filter-input.c:189
+#: filter/filter-input.c:194
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5075,58 +5427,38 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: filter/filter-part.c:467
+#: filter/filter-part.c:475
 msgid "Test"
 msgstr "Comprova"
 
-#: filter/filter-rule.c:597
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Nom de la regla: "
 
-#: filter/filter-rule.c:601
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "Sense t�tol"
 
-#: filter/filter-rule.c:617
+#: filter/filter-rule.c:646
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:634
+#: filter/filter-rule.c:664
 msgid "Execute actions"
 msgstr "Executa les accions"
 
-#: filter/filter-rule.c:638
+#: filter/filter-rule.c:668
 msgid "if all criteria are met"
 msgstr "si es compleixen tots els criteris"
 
-#: filter/filter-rule.c:643
+#: filter/filter-rule.c:673
 msgid "if any criteria are met"
 msgstr "si es compleix qualsevol criteri"
 
-#: filter/filter-rule.c:654
+#: filter/filter-rule.c:684
 msgid "Add criterion"
 msgstr "Afegeix un criteri"
 
-#: filter/filter-rule.c:660
-msgid "Remove criterion"
-msgstr "Elimina un criteri"
-
-#: filter/filter-system-flag.c:67
-#, fuzzy
-msgid "Replied to"
-msgstr "Respon a tots"
-
-#. { N_("Deleted"), "Deleted" },
-#. { N_("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr ""
-
-#: filter/filter-system-flag.c:71
-#, fuzzy
-msgid "Read"
-msgstr "R�dio"
-
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Filtres d'edici�"
@@ -5147,7 +5479,7 @@ msgstr ""
 msgid "Outgoing"
 msgstr "Contorn:"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Carpetes virtuals"
 
@@ -5173,293 +5505,332 @@ msgstr ""
 msgid "with all local folders"
 msgstr "Crea una carpeta nova"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Assigna un color"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Assigna una puntuaci�"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 #, fuzzy
 msgid "Attachments"
 msgstr "adjunci�"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "cont�"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Copia a la carpeta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Data de recepci�"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Data d'enviament"
 
-#: filter/libfilter-i18n.h:12
-msgid "does not contain"
-msgstr "no cont�"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not end with"
-msgstr "no acaba amb "
-
-#: filter/libfilter-i18n.h:14
-msgid "does not exist"
-msgstr "no existeix"
-
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:9
 #, fuzzy
-msgid "does not sound like"
-msgstr "no acaba amb "
-
-#: filter/libfilter-i18n.h:16
-msgid "does not start with"
-msgstr "no comen�a per"
+msgid "Deleted"
+msgstr "Suprimeix"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:10
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "no existeix"
 
-#: filter/libfilter-i18n.h:18
-msgid "ends with"
-msgstr "acaba amb"
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Draft"
+msgstr "Data de venciment"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Exist"
 msgstr "S_urt"
 
-#: filter/libfilter-i18n.h:20
-msgid "exists"
-msgstr "existeix"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Expressi�"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Forward to Address"
 msgstr "Reenvia-ho a l'adre�a"
 
-#: filter/libfilter-i18n.h:23
-msgid "is"
-msgstr "�s"
-
-#: filter/libfilter-i18n.h:24
-msgid "is greater than"
-msgstr "�s m�s gran que"
-
-#: filter/libfilter-i18n.h:25
-msgid "is less than"
-msgstr "�s m�s petit que"
+#: filter/libfilter-i18n.h:15
+msgid "Important"
+msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "is not"
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "Is Not"
 msgstr "no �s"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Is"
+msgstr "Si"
+
+#: filter/libfilter-i18n.h:18
 #, fuzzy
 msgid "Mailing list"
 msgstr "Llista de correu %s"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:19
 msgid "Message Body"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:20
 #, fuzzy
 msgid "Message Header"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:21
 msgid "Message was received"
 msgstr "S'ha rebut el missatge"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:22
 msgid "Message was sent"
 msgstr "S'ha enviat el missatge"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:23
 msgid "Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: filter/libfilter-i18n.h:33
-msgid "on or after"
-msgstr "el o despr�s del"
-
-#: filter/libfilter-i18n.h:34
-msgid "on or before"
-msgstr "el o abans del"
+#: filter/libfilter-i18n.h:24
+#, fuzzy
+msgid "Read"
+msgstr "R�dio"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:25
 msgid "Recipients"
 msgstr "Destinataris"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:26
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1171
+#: filter/libfilter-i18n.h:27
+#, 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
 msgid "Score"
 msgstr "Puntuaci�"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:29
+msgid "Sender"
+msgstr "Remitent"
+
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "Set Status"
 msgstr "Estat de la connexi�"
 
-#: filter/libfilter-i18n.h:40
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
-msgid "Source"
-msgstr "Font"
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "Source Account"
+msgstr "cont�"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:32
 msgid "Specific header"
 msgstr "Especifiqueu la cap�alera"
 
-#: filter/libfilter-i18n.h:43
-msgid "starts with"
-msgstr "comen�a per"
-
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:34
 msgid "Stop Processing"
 msgstr "Atura el processament"
 
-#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
+#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
 msgid "Subject"
 msgstr "Assumpte"
 
+#: filter/libfilter-i18n.h:38
+msgid "contains"
+msgstr "cont�"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not contain"
+msgstr "no cont�"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not end with"
+msgstr "no acaba amb "
+
+#: filter/libfilter-i18n.h:41
+msgid "does not exist"
+msgstr "no existeix"
+
+#: filter/libfilter-i18n.h:42
+#, fuzzy
+msgid "does not sound like"
+msgstr "no acaba amb "
+
+#: filter/libfilter-i18n.h:43
+msgid "does not start with"
+msgstr "no comen�a per"
+
+#: filter/libfilter-i18n.h:44
+msgid "ends with"
+msgstr "acaba amb"
+
+#: filter/libfilter-i18n.h:45
+msgid "exists"
+msgstr "existeix"
+
+#: filter/libfilter-i18n.h:46
+msgid "is greater than"
+msgstr "�s m�s gran que"
+
 #: filter/libfilter-i18n.h:47
+msgid "is less than"
+msgstr "�s m�s petit que"
+
+#: filter/libfilter-i18n.h:48
+msgid "is not"
+msgstr "no �s"
+
+#: filter/libfilter-i18n.h:49
+msgid "is"
+msgstr "�s"
+
+#: filter/libfilter-i18n.h:50
+msgid "on or after"
+msgstr "el o despr�s del"
+
+#: filter/libfilter-i18n.h:51
+msgid "on or before"
+msgstr "el o abans del"
+
+#: filter/libfilter-i18n.h:52
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:53
+msgid "starts with"
+msgstr "comen�a per"
+
+#: filter/libfilter-i18n.h:54
 msgid "was after"
 msgstr "ha estat despr�s de"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:55
 msgid "was before"
 msgstr "ha estat abans de"
 
-#: filter/score-editor.c:126
+#: filter/score-editor.c:130
 #, fuzzy
 msgid "Score Rules"
 msgstr "Edita la regla de puntuaci�"
 
-#: mail/component-factory.c:306
+#: mail/component-factory.c:329
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:379
+#: mail/component-factory.c:402
 msgid "Cannot register storage with shell"
 msgstr "No es pot registrar l'emmagatzemament amb l'int�rpret d'ordres"
 
-#: mail/folder-browser-factory.c:237
+#: mail/folder-browser-factory.c:209
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propietats..."
 
-#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 #, fuzzy
 msgid "Properties"
 msgstr "Propietats..."
 
-#: mail/folder-browser.c:219
+#: mail/folder-browser.c:225
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "Seleccioneu una carpeta"
 
-#: mail/folder-browser.c:509
+#: mail/folder-browser.c:533
 msgid "VFolder on Subject"
 msgstr "VFolder sobre l'assumpte"
 
-#: mail/folder-browser.c:512
+#: mail/folder-browser.c:536
 msgid "VFolder on Sender"
 msgstr "VFolder sobre el remitent"
 
-#: mail/folder-browser.c:515
+#: mail/folder-browser.c:539
 msgid "VFolder on Recipients"
 msgstr "VFolder sobre els destinataris"
 
-#: mail/folder-browser.c:518 mail/folder-browser.c:702
+#: mail/folder-browser.c:542 mail/folder-browser.c:733
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:524
+#: mail/folder-browser.c:548
 msgid "Filter on Subject"
 msgstr "Filtre sobre l'assumpte"
 
-#: mail/folder-browser.c:527
+#: mail/folder-browser.c:551
 msgid "Filter on Sender"
 msgstr "Filtre sobre el remitent"
 
-#: mail/folder-browser.c:530
+#: mail/folder-browser.c:554
 msgid "Filter on Recipients"
 msgstr "Filtre sobre els destinataris"
 
-#: mail/folder-browser.c:533 mail/folder-browser.c:701
+#: mail/folder-browser.c:557 mail/folder-browser.c:732
 msgid "Filter on Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:544
+#: mail/folder-browser.c:568
+#, fuzzy
+msgid "Resend"
+msgstr "segon"
+
+#: mail/folder-browser.c:570
 #, fuzzy
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
-#: mail/folder-browser.c:546 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Imprimeix"
-
-#: mail/folder-browser.c:551
+#: mail/folder-browser.c:577
 msgid "Reply to Sender"
 msgstr "Respon al remitent"
 
-#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
+#: 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:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
+#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
 msgid "Forward"
 msgstr "Reenvia"
 
-#: mail/folder-browser.c:557
+#: 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:560
+#: mail/folder-browser.c:586
 #, fuzzy
 msgid "Mark as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: mail/folder-browser.c:562
+#: mail/folder-browser.c:588
 #, fuzzy
 msgid "Mark as Unread"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:567
+#: mail/folder-browser.c:593
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Mou a la carpeta"
 
-#: mail/folder-browser.c:569
+#: mail/folder-browser.c:595
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Copia a la carpeta"
 
-#: mail/folder-browser.c:573
+#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
 #, fuzzy
 msgid "Undelete"
 msgstr "Suprimeix"
@@ -5468,21 +5839,21 @@ msgstr "Suprimeix"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:583
+#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_Aplica els filtres"
 
-#: mail/folder-browser.c:587
+#: mail/folder-browser.c:613
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:735
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/folder-browser.c:705
+#: mail/folder-browser.c:736
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
@@ -5565,19 +5936,28 @@ msgstr ""
 msgid "mh"
 msgstr "h"
 
-#: mail/mail-accounts.c:116
+#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
 #, fuzzy
 msgid " (default)"
 msgstr "Valors predeterminats"
 
-#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#: mail/mail-accounts.c:197
+#, fuzzy
+msgid "Disable"
+msgstr "Inhabilitat"
+
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+msgid "Enable"
+msgstr ""
+
+#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
@@ -5585,52 +5965,45 @@ msgstr ""
 "suprimir aquest contacte?"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:423
+#: mail/mail-accounts.c:536
 msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/mail-account-editor.c:307
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
+#: 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:706
+#: mail/mail-account-editor.c:173
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: mail/mail-account-editor.c:727
-#, fuzzy
-msgid "Unspecified"
-msgstr "Especifiqueu la cap�alera"
-
-#: mail/mail-autofilter.c:71
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Correu per a %s"
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, fuzzy, c-format
 msgid "Subject is %s"
 msgstr "Assumpte"
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr "Correu de %s"
 
-#: mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr "Llista de correu %s"
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
 msgid "Add Filter Rule"
 msgstr "Afegeix una regla de filtre"
 
-#: mail/mail-callbacks.c:85
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5642,7 +6015,7 @@ msgstr ""
 "rebre o redactar correu.\n"
 "El voleu configurar ara?"
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5650,7 +6023,7 @@ msgstr ""
 "Cal que configureu una identitat\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:150
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5658,11 +6031,11 @@ msgstr ""
 "Cal que configureu un transport de correu\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:202
 msgid "You have not set a mail transport method"
 msgstr "No heu definit cap m�tode de transport de correu"
 
-#: mail/mail-callbacks.c:227
+#: mail/mail-callbacks.c:235
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5670,36 +6043,36 @@ msgstr ""
 "Aquest missatge no t� cap assumpte.\n"
 "Voleu que l'envi� igualment?"
 
-#: mail/mail-callbacks.c:294
+#: mail/mail-callbacks.c:308
+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
 #, 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:316
-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:579
+#: mail/mail-callbacks.c:591
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:761
+#: mail/mail-callbacks.c:773
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-callbacks.c:864
+#: mail/mail-callbacks.c:876
 msgid "Move message(s) to"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-callbacks.c:866
+#: mail/mail-callbacks.c:878
 msgid "Copy message(s) to"
 msgstr "Copia el(s) missatge(s) a"
 
-#: mail/mail-callbacks.c:1007
+#: mail/mail-callbacks.c:1019
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5707,11 +6080,20 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1056
+#, fuzzy
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+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:1044 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5719,17 +6101,17 @@ msgstr ""
 "Ja existeix una fitxer amb aquest nom.\n"
 "El voleu sobreescriure?"
 
-#: mail/mail-callbacks.c:1088
+#: mail/mail-callbacks.c:1137
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:1090
+#: mail/mail-callbacks.c:1139
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:1204
+#: mail/mail-callbacks.c:1253
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5738,51 +6120,62 @@ msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1349
 msgid "Printing of message failed"
 msgstr "Ha fallat la impressi� del missatge"
 
+#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#, fuzzy
+msgid "Connecting to server..."
+msgstr "Connexi� de prova a \"%s\""
+
 #: mail/mail-config.glade.h:1
 #, fuzzy
+msgid " Check for supported types "
+msgstr "Detecta els tipus suportats..."
+
+#: mail/mail-config.glade.h:2
+#, fuzzy
+msgid " color"
+msgstr "Colors"
+
+#: mail/mail-config.glade.h:3
+#, fuzzy
 msgid "Account"
 msgstr "cont�"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "Account Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
-msgid "Advanced"
-msgstr "Afegeix..."
+msgid "Accounts"
+msgstr "cont�"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "Authentication"
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 #, fuzzy
-msgid "Authentication Type:"
+msgid "Authentication Type: "
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:9
-msgid "Automatically check mail every"
-msgstr ""
-
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Check settings"
-msgstr "Par�metres de prova"
+msgid "Automatically check for new mail every"
+msgstr "Comprova si hi ha nou correu"
 
 #: mail/mail-config.glade.h:12
 #, fuzzy
@@ -5797,404 +6190,391 @@ msgstr ""
 "Ja teniu enllestida la configuraci� del correu.\n"
 "Feu clic a \"Finalitza\" per desar els nous par�metres"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "De_fault"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Done"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:21
 #, fuzzy
-msgid "Email Address:"
-msgstr "Adre�a electr�nica:"
+msgid "Drafts"
+msgstr "Data de venciment"
 
-#: mail/mail-config.glade.h:24
-msgid "Email address:"
-msgstr "Adre�a electr�nica:"
+#: mail/mail-config.glade.h:22
+#, fuzzy
+msgid "Drafts folder:"
+msgstr "Creaci� d'una nova carpeta"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
-msgid "Evolution Mail Configuration"
-msgstr "Configuraci� del correu"
+msgid "Email Address:"
+msgstr "Adre�a electr�nica:"
 
 #: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "Full Name:"
 msgstr "Nom complet:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 #, fuzzy
-msgid "Hostname:"
-msgstr "Nom d'usuari:"
+msgid "Highlight citations with "
+msgstr "Ressalta els elemts que vencen avui"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
-msgid "IMAP"
+msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Identity"
 msgstr "Identitat"
 
-#: mail/mail-config.glade.h:32
-msgid "Include this account when receiving mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:33
-#, fuzzy
-msgid "Keep mail on server"
-msgstr "No suprimeixis els missatges del servidor"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 #, fuzzy
-msgid "Kerberos"
+msgid "Kerberos "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:35
-#, fuzzy
-msgid "Mail"
-msgstr "_Correu"
-
-#: mail/mail-config.glade.h:36
-#, fuzzy
-msgid "Mail Account"
-msgstr "cont�"
-
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:32
 msgid "Mail Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:38
-#, fuzzy
-msgid "Mail Configuration Druid"
-msgstr "Configuraci� del correu"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid "Mark messages as \"Read\" after:"
 msgstr "Marca el missatge com a vist [ms]: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "News"
 msgstr "Nou"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:38
 #, fuzzy
-msgid "Optional"
-msgstr "Opcions"
+msgid "Optional Information"
+msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:39
 msgid "Organization:"
 msgstr "Organitzaci�:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:41
 msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:46
 #, fuzzy
-msgid "Password:"
-msgstr "Contrasenya"
-
-#: mail/mail-config.glade.h:50
-msgid "Plain Text"
-msgstr ""
+msgid "Qmail maildir "
+msgstr "Adre�a electr�nica 2"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:48
 #, fuzzy
-msgid "Remember my password"
-msgstr "Desa com a VCard"
+msgid "Receiving Mail"
+msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:49
 #, fuzzy
-msgid "Reply address:"
-msgstr "Adre�a electr�nica:"
+msgid "Receiving Options"
+msgstr "Data de recepci�"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Required Information"
+msgstr "Cap informaci�"
+
+#: mail/mail-config.glade.h:53
+msgid "Select PGP binary"
+msgstr ""
 
 #: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "Required"
-msgstr "Persones _requerides"
+msgid "Send mail in HTML format by default."
+msgstr "Envia els missatges en format HTML"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Save password"
-msgstr "Desa com a VCard"
+msgid "Sending Email"
+msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:57
-msgid "Select PGP binary"
-msgstr ""
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Sendmail"
 
 #: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Select signature file"
-msgstr "Fitxer de signatura:"
+msgid "Sent"
+msgstr "Vist"
 
 #: mail/mail-config.glade.h:59
 #, fuzzy
-msgid "Send mail in HTML format by default."
-msgstr "Envia els missatges en format HTML"
+msgid "Sent and Draft Messages"
+msgstr "Agenda"
 
 #: mail/mail-config.glade.h:60
 #, fuzzy
-msgid "Sending Email"
-msgstr "Sendmail"
+msgid "Sent messages folder:"
+msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Server Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
-#, fuzzy
-msgid "Server type:"
-msgstr "Servidor:"
-
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Signature file:"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:67
-#, fuzzy
-msgid "Signature:"
-msgstr "Fitxer de signatura:"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:65
 msgid "Sources"
 msgstr "Fonts"
 
-#: mail/mail-config.glade.h:70
-msgid "This server requires a secure connection (SSL)"
-msgstr ""
-
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:66
 #, fuzzy
-msgid "Transport"
-msgstr "Transparent"
+msgid "Special Folders"
+msgstr "Carpetes virtuals"
 
-#: mail/mail-config.glade.h:72
-#, fuzzy
-msgid "Transport Authentication"
-msgstr "Autenticaci�:"
+#: mail/mail-config.glade.h:67
+msgid "Standard Unix mbox"
+msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Type"
 msgstr "Tipus:"
 
-#: mail/mail-config.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
+#: mail/mail-config.glade.h:69
+msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
-#, fuzzy
-msgid "User Information"
-msgstr "Cap informaci�"
-
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:70
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:71
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: 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:28
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
 msgid "_Edit"
 msgstr "_Edita"
 
-#: mail/mail-config.glade.h:83
-#, fuzzy
-msgid "minutes."
-msgstr "minuts"
+#: 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:421
-#, c-format
+#: mail/mail-config-druid.c:101
 msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+"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:515
-#, fuzzy
-msgid "Namespace:"
-msgstr "Nom:"
+#: 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:708
-#, c-format
+#: mail/mail-config-druid.c:107
 msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+"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:1215
+#: mail/mail-config-druid.c:445
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-display.c:189
+#: mail/mail-display.c:194
 msgid "Save Attachment"
 msgstr "Desa l'adjunci�"
 
-#: mail/mail-display.c:229
+#: 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:290
+#: mail/mail-display.c:295
 msgid "Save to Disk..."
 msgstr "Desa al disc..."
 
-#: mail/mail-display.c:292
+#: mail/mail-display.c:297
 #, c-format
 msgid "Open in %s..."
 msgstr "Obre a %s..."
 
-#: mail/mail-display.c:294
+#: mail/mail-display.c:299
 msgid "View Inline"
 msgstr "Visualitza en l�nia"
 
-#: mail/mail-display.c:323
+#: mail/mail-display.c:334
 msgid "External Viewer"
 msgstr "Visualitzador extern"
 
-#: mail/mail-display.c:346
+#: mail/mail-display.c:357
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visualitza en l�nia (mitjan�ant %s)"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:361
 msgid "Hide"
 msgstr "Amaga"
 
-#: mail/mail-format.c:506
+#: mail/mail-display.c:1102
+#, fuzzy
+msgid "Open link in browser"
+msgstr "Obre'l en una nova finestra"
+
+#: mail/mail-display.c:1104
+#, fuzzy
+msgid "Save as (FIXME)"
+msgstr "_Tasca (FIXME)"
+
+#: mail/mail-display.c:1106
+#, fuzzy
+msgid "Copy location (FIXME)"
+msgstr "_Contacte (FIXME)"
+
+#: mail/mail-format.c:518
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "adjunci�"
 
-#: mail/mail-format.c:704
+#: mail/mail-format.c:560
+#, 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
 #, fuzzy
 msgid "Loading message content"
 msgstr "S'estan reenviant els missatges \"%s\""
 
-#: mail/mail-format.c:993
+#: mail/mail-format.c:1046
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Esborra la visualitzaci� del missatge"
 
-#: mail/mail-format.c:999
+#: mail/mail-format.c:1052
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Edita el missatge"
 
-#: mail/mail-format.c:1000
+#: mail/mail-format.c:1053
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1069 mail/mail-format.c:1456
+#: mail/mail-format.c:1137 mail/mail-format.c:1526
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1077 mail/mail-format.c:1464
+#: mail/mail-format.c:1145 mail/mail-format.c:1534
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1677
+#: mail/mail-format.c:1747
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1689
+#: mail/mail-format.c:1759
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1693
+#: mail/mail-format.c:1763
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:1727
+#: mail/mail-format.c:1797
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1732
+#: mail/mail-format.c:1802
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:335
+#: mail/mail-local.c:337
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "La carpeta `%s' no existeix."
 
-#: mail/mail-local.c:508
+#: mail/mail-local.c:509
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "Obre a %s..."
 
-#: mail/mail-local.c:786
+#: mail/mail-local.c:787
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "S'est� convertint la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:790
+#: 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:814
+#: mail/mail-local.c:815
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Configura la carpeta"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:843
+#: mail/mail-local.c:844
 msgid "Closing current folder"
 msgstr "S'est� tancant la carpeta actual"
 
-#: mail/mail-local.c:875
+#: 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:893
+#: mail/mail-local.c:894
 msgid "Creating new folder"
 msgstr "Creaci� d'una nova carpeta"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:908
 msgid "Copying messages"
 msgstr "C�pia de missatges"
 
-#: mail/mail-local.c:928
+#: mail/mail-local.c:925
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6203,7 +6583,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:967
+#: mail/mail-local.c:964
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6211,7 +6591,7 @@ msgstr ""
 "Si ja no podeu obrir aquesta b�stia de correu\n"
 "potser us caldr� reparar-la manualment."
 
-#: mail/mail-mt.c:177
+#: mail/mail-mt.c:190
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6220,7 +6600,7 @@ msgstr ""
 "Error en `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:179
+#: mail/mail-mt.c:192
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6229,408 +6609,388 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
+#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
 #, fuzzy
 msgid "Working"
 msgstr "S'est� movent"
 
-#: mail/mail-mt.c:666 mail/session.c:91
+#: mail/mail-mt.c:679 mail/session.c:98
 msgid "Do you accept?"
 msgstr ""
 
-#: mail/mail-mt.c:860
+#: mail/mail-mt.c:873
 #, fuzzy
 msgid "Evolution progress"
 msgstr "Evolution"
 
-#: mail/mail-ops.c:516
+#: mail/mail-ops.c:587
 #, c-format
 msgid "Sending \"%s\""
 msgstr "S'est� enviant \"%s\""
 
-#: mail/mail-ops.c:518
+#: mail/mail-ops.c:589
 #, fuzzy
 msgid "Sending message"
 msgstr "Envia aquest missatge"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:704
+#, fuzzy, c-format
+msgid "Sending message %d of %d"
+msgstr "S'est� escrivint el missatge %d de %d"
+
+#: mail/mail-ops.c:723
+#, 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
+#, fuzzy
+msgid "Complete."
+msgstr "% comp_let:"
+
+#: mail/mail-ops.c:811
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "C�pia de missatges"
 
-#: mail/mail-ops.c:842
+#: mail/mail-ops.c:900
 msgid "Moving"
 msgstr "S'est� movent"
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:903
 msgid "Copying"
 msgstr "S'est� copiant"
 
-#: mail/mail-ops.c:856
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s missatge %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:978
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1085
+#: mail/mail-ops.c:1139
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
+#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1193
+#: mail/mail-ops.c:1247
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1380
+#: mail/mail-ops.c:1434
 #, fuzzy
 msgid "Expunging folder"
 msgstr "S'est� esborrant \"%s\""
 
-#: mail/mail-ops.c:1429
+#: mail/mail-ops.c:1483
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1496
+#: mail/mail-ops.c:1550
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1506
+#: 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:1580
+#: mail/mail-ops.c:1634
 #, fuzzy
 msgid "Saving messages"
 msgstr "C�pia de missatges"
 
-#: mail/mail-ops.c:1659
+#: mail/mail-ops.c:1713
 #, 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:1672
+#: 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:1686
+#: mail/mail-ops.c:1740
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: mail/mail-ops.c:1760
+#: mail/mail-ops.c:1814
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Desa l'adjunci�"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1829
 #, 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:1803
+#: mail/mail-ops.c:1857
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: mail/mail-search-dialogue.c:107
+#: mail/mail-search-dialogue.c:113
 #, fuzzy
 msgid "_Search"
 msgstr "Cerca"
 
-#: mail/mail-send-recv.c:136
+#: mail/mail-send-recv.c:138
 #, fuzzy
 msgid "Cancelling ..."
 msgstr "Cancel�lat"
 
-#: mail/mail-send-recv.c:231
+#: mail/mail-send-recv.c:233
 #, fuzzy
 msgid "Send & Receive mail"
 msgstr "Sendmail"
 
-#: mail/mail-send-recv.c:234
+#: mail/mail-send-recv.c:236
 #, fuzzy
 msgid "Receiving"
 msgstr "Data de recepci�"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:285
 msgid "Updating ..."
 msgstr ""
 
-#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+#: 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:306
 #, fuzzy
 msgid "Sending"
 msgstr "S'est� enviant \"%s\""
 
-#: mail/mail-send-recv.c:469
+#: mail/mail-send-recv.c:471
 #, fuzzy
 msgid "Cancelled."
 msgstr "Cancel�lat"
 
-#: mail/mail-send-recv.c:473
-#, fuzzy
-msgid "Complete."
-msgstr "% comp_let:"
-
-#: mail/mail-summary.c:111
+#: mail/mail-summary.c:109
 msgid "Incomplete message written on pipe!"
 msgstr "S'ha escrit un missatge incomplet al conducte!"
 
-#: mail/mail-tools.c:138
+#: mail/mail-tools.c:141
 #, 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:185
+#: mail/mail-tools.c:188
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (missatge reenviat)"
 
-#: mail/mail-tools.c:195
+#: mail/mail-tools.c:198
 msgid "Fwd: (no subject)"
 msgstr "Re: (sense assumpte)"
 
-#: mail/mail-tools.c:212
+#: mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:214
+#: mail/mail-tools.c:217
 msgid "Forwarded message (no subject)"
 msgstr "Missatge reenviat (sense assumpte)"
 
-#: mail/mail-tools.c:411
+#: 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-vfolder.c:248
+#: mail/mail-vfolder.c:249
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:427
 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:138 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
 msgid "Reply"
 msgstr "Respon"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: 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:141 ui/evolution-mail.xml.h:41
+#: 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:144 ui/evolution-mail.xml.h:17
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
 msgid "Forward this message"
 msgstr "Reenvia aquest missatge"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
+#: 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:150 ui/evolution-mail.xml.h:8
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Suprimeix aquest missatge"
 
-#: mail/message-list.c:618
+#: mail/message-list.c:648
 msgid "Unseen"
 msgstr "No vist"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:649
 msgid "Seen"
 msgstr "Vist"
 
-#: mail/message-list.c:624
+#: mail/message-list.c:650
 msgid "Answered"
 msgstr "Respost"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:651
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: mail/message-list.c:630
+#: mail/message-list.c:652
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Mou el missatge"
 
-#: mail/message-list.c:952
-#, c-format
-msgid "[ %s ]"
-msgstr ""
+#: mail/message-list.c:656
+#, fuzzy
+msgid "Lowest"
+msgstr "Baixa"
 
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:964 mail/message-list.c:980
-#, c-format
-msgid "%s, et al."
-msgstr ""
+#: mail/message-list.c:657
+#, fuzzy
+msgid "Lower"
+msgstr "Baixa"
 
-#: mail/message-list.c:967 mail/message-list.c:983
+#: mail/message-list.c:661
 #, fuzzy
-msgid "<unknown>"
-msgstr "Desconegut"
+msgid "Higher"
+msgstr "Alta"
 
-#: mail/message-list.c:1035
+#: mail/message-list.c:662
+#, fuzzy
+msgid "Highest"
+msgstr "Alta"
+
+#: mail/message-list.c:912
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1042
+#: mail/message-list.c:919
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1051
+#: mail/message-list.c:928
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1063
+#: mail/message-list.c:940
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1071
+#: mail/message-list.c:948
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1073
+#: mail/message-list.c:950
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:1171
+#: mail/message-list.c:1052
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "From"
 msgstr "De:"
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "Date"
 msgstr "Data de venciment"
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "Received"
 msgstr "Data de recepci�"
 
-#: mail/message-list.c:1173
+#: mail/message-list.c:1054
 msgid "To"
 msgstr "Per a"
 
-#: mail/message-list.c:1173
+#: mail/message-list.c:1054
 msgid "Size"
 msgstr "Mida"
 
-#: mail/openpgp-utils.c:89
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Si us plau, introdu�u la vostra contrasenya PGP/GPG."
-
-#: mail/openpgp-utils.c:92
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Si us plau, introdu�u la vostra contrasenya PGP/GPG."
-
-#: 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 "No hi ha cap programa GPG/PGP disponible."
-
-#: 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 "No s'ha indicat cap contrasenya."
-
-#: 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"
-msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:588
-msgid "No recipients specified"
-msgstr ""
-
-#: mail/openpgp-utils.c:1088
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "No s'ha pogut crear el conducte: %s"
-
-#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
 #, fuzzy
 msgid "Folder"
 msgstr "Carpetes"
 
-#: mail/subscribe-dialog.c:65
+#: mail/subscribe-dialog.c:77
 #, fuzzy
 msgid "Store"
 msgstr "Puntuaci�"
 
-#: mail/subscribe-dialog.c:147
+#: mail/subscribe-dialog.c:138
 #, fuzzy
 msgid "Display folders starting with:"
 msgstr "Visualitza les carpetes que continguin:"
 
-#: mail/subscribe-dialog.c:177
+#: mail/subscribe-dialog.c:168
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:280
+#: mail/subscribe-dialog.c:271
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:273
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
+#. Construct the app
+#: mail/subscribe-dialog.c:873
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Gestiona les subscripcions..."
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #, fuzzy
 msgid "Folder name:"
@@ -6646,9 +7006,18 @@ msgstr "Carpetes"
 msgid "Specify where to create the folder:"
 msgstr "No hi ha espai suficient per crear la carpeta"
 
+#: 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:157
+#: shell/importer/importer.c:182
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6656,77 +7025,73 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/importer/importer.c:175 shell/importer/importer.c:202
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/importer/importer.c:309
+#: 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."
 
-#: shell/importer/importer.c:319
+#: shell/importer/importer.c:351
 #, fuzzy
 msgid "Importing"
 msgstr "S'est� movent"
 
-#: shell/importer/importer.c:327
+#: shell/importer/importer.c:359
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/importer/importer.c:342
+#: shell/importer/importer.c:372
+#, fuzzy, c-format
+msgid "Error starting %s"
+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"
 
-#: shell/importer/importer.c:357
+#: shell/importer/importer.c:402
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/importer/importer.c:428
+#: shell/importer/importer.c:473
 #, fuzzy
 msgid "Automatic"
 msgstr "Tria autom�tica"
 
-#: shell/importer/importer.c:478
+#: shell/importer/importer.c:523
 #, fuzzy
 msgid "Filename:"
 msgstr "Nom del fitxer:"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
 #, fuzzy
 msgid "Select a file"
 msgstr "Fitxer de signatura:"
 
-#: shell/importer/importer.c:493
+#: shell/importer/importer.c:538
 #, fuzzy
 msgid "File type:"
 msgstr "Nom del fitxer:"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
 msgid "Import"
 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."
-msgstr ""
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -6748,11 +7113,11 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: shell/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr "Instal�laci� de l'Evolution"
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:122
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6760,32 +7125,32 @@ msgstr ""
 "Aquesta nova versi� de l'Evolution necessita instal�lar fitxers addicionals\n"
 "al directori personal on teniu l'Evolution"
 
-#: shell/e-setup.c:117
+#: shell/e-setup.c:123
 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:157
+#: shell/e-setup.c:163
 msgid "Could not update files correctly"
 msgstr "No s'han pogut actualitzar correctament els fitxers"
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
+#: 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:189
+#: shell/e-setup.c:195
 #, 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:190
+#: shell/e-setup.c:196
 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:209
+#: shell/e-setup.c:215
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6796,7 +7161,7 @@ msgstr ""
 "%s\n"
 "Error: %s"
 
-#: shell/e-setup.c:224
+#: shell/e-setup.c:230
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -6805,7 +7170,7 @@ msgstr ""
 "No es poden copiar els fitxers a\n"
 "`%s'."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:255
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6816,7 +7181,7 @@ msgstr ""
 "Si us plau, moveu-lo per permetre la instal�laci�\n"
 "dels fitxers d'usuari de l'Evolution."
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:267
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6827,7 +7192,7 @@ 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:96
+#: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -6836,11 +7201,11 @@ msgstr ""
 "No es pot crear la carpeta indicada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:153
+#: shell/e-shell-folder-creation-dialog.c:156
 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:245
+#: shell/e-shell-folder-creation-dialog.c:248
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crea una nova carpeta"
 
@@ -6852,28 +7217,28 @@ 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:318
+#: shell/e-shell-folder-selection-dialog.c:319
 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:459 shell/e-shell-folder-title-bar.c:460
 msgid "(Untitled)"
 msgstr "(Sense t�tol)"
 
-#: shell/e-shell-view-menu.c:159
+#: shell/e-shell-view-menu.c:173
 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:165
+#: shell/e-shell-view-menu.c:179
 msgid "Bug buddy could not be run."
 msgstr "No es pot executar el Bug Buddy."
 
-#: shell/e-shell-view-menu.c:194
+#: shell/e-shell-view-menu.c:208
 #, fuzzy
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:196
+#: shell/e-shell-view-menu.c:210
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6883,34 +7248,30 @@ msgstr ""
 "per a correu, agenda i gesti� de contactes\n"
 "dins de l'entorn d'escriptori GNOME."
 
-#: shell/e-shell-view-menu.c:360
+#: shell/e-shell-view-menu.c:374
 msgid "Go to folder..."
 msgstr "V�s a la carpeta..."
 
-#: shell/e-shell-view.c:143
+#: shell/e-shell-view.c:148
 msgid "(No folder displayed)"
 msgstr "(Cap carpeta mostrada)"
 
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Carpetes"
-
-#: shell/e-shell-view.c:1124
+#: shell/e-shell-view.c:1134
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1126
+#: shell/e-shell-view.c:1136
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:372
+#: shell/e-shell.c:378
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No es pot configurar l'emmagatzemament local -- %s"
 
-#: shell/e-shell.c:1242
+#: shell/e-shell.c:1248
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6919,15 +7280,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:123
+#: shell/e-shortcuts-view.c:134
 msgid "Create new shortcut group"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:137
 msgid "Group name:"
 msgstr "Nom del grup:"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:260
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -6936,75 +7297,75 @@ msgstr ""
 "Esteu segur que voleu eliminar el grup\n"
 "`%s' de la barra de dreceres?"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:265
 msgid "Don't remove"
 msgstr "No l'eliminis"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:276
 msgid "_Small Icons"
 msgstr "Icones _petites"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:277
 msgid "Show the shortcuts as small icons"
 msgstr "Mostra les dreceres com a icones petites"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:279
 msgid "_Large Icons"
 msgstr "Icones _grans"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:280
 msgid "Show the shortcuts as large icons"
 msgstr "Mostra les dreceres com a icones grans"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:291
 msgid "_New Group..."
 msgstr "_Nou grup..."
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:292
 msgid "Create a new shortcut group"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:294
 msgid "_Remove This Group..."
 msgstr "_Elimina aquest grup..."
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:295
 msgid "Remove this shortcut group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:300
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:301
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate"
 msgstr "Activa"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate this shortcut"
 msgstr "Activa aquesta drecera"
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:388
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Elimina aquesta drecera de la barra de dreceres"
 
-#: shell/e-shortcuts.c:375
+#: shell/e-shortcuts.c:379
 msgid "Error saving shortcuts."
 msgstr "Error en desar les dreceres."
 
-#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: 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:42
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
 msgid "_View"
 msgstr "_Visualitza"
 
-#: shell/e-storage-set-view.c:468
+#: shell/e-storage-set-view.c:649
 msgid "View the selected folder"
 msgstr "Visualitza la carpeta seleccionada"
 
@@ -7012,47 +7373,47 @@ msgstr "Visualitza la carpeta seleccionada"
 msgid "(No name)"
 msgstr "(Sense nom)"
 
-#: shell/e-storage.c:429
+#: shell/e-storage.c:459
 msgid "No error"
 msgstr "Cap error"
 
-#: shell/e-storage.c:431
+#: shell/e-storage.c:461
 msgid "Generic error"
 msgstr "Error gen�ric"
 
-#: shell/e-storage.c:433
+#: shell/e-storage.c:463
 msgid "A folder with the same name already exists"
 msgstr "Ja existeix una carpeta amb el mateix nom"
 
-#: shell/e-storage.c:435
+#: shell/e-storage.c:465
 msgid "The specified folder type is not valid"
 msgstr "El tipus de carpeta especificat no �s v�lid"
 
-#: shell/e-storage.c:437
+#: shell/e-storage.c:467
 msgid "I/O error"
 msgstr "Error d'E/S"
 
-#: shell/e-storage.c:439
+#: shell/e-storage.c:469
 msgid "Not enough space to create the folder"
 msgstr "No hi ha espai suficient per crear la carpeta"
 
-#: shell/e-storage.c:441
+#: shell/e-storage.c:471
 msgid "The specified folder was not found"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:443
+#: shell/e-storage.c:473
 msgid "Function not implemented in this storage"
 msgstr "Funci� no implementada en aquest emmagatzemament"
 
-#: shell/e-storage.c:445
+#: shell/e-storage.c:475
 msgid "Permission denied"
 msgstr "Perm�s denegat"
 
-#: shell/e-storage.c:447
+#: shell/e-storage.c:477
 msgid "Operation not supported"
 msgstr "Operaci� no suportada"
 
-#: shell/e-storage.c:449
+#: shell/e-storage.c:479
 msgid "The specified type is not supported in this storage"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
@@ -7061,7 +7422,7 @@ msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 msgid "The Evolution shell."
 msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
 
-#: shell/main.c:73
+#: shell/main.c:83
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -7103,7 +7464,7 @@ msgstr ""
 "Esperem que gaudiu del resultat de la nostra feixuga feina, i esperem\n"
 "ansiosament les vostres contribucions!\n"
 
-#: shell/main.c:98
+#: shell/main.c:108
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7111,16 +7472,19 @@ msgstr ""
 "Gr�cies\n"
 "L'equip de l'Evolution\n"
 
-#: shell/main.c:129
+#: shell/main.c:139
 msgid "Cannot initialize the Evolution shell."
 msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
 
-#: shell/main.c:175
-#, fuzzy
-msgid "Disable."
-msgstr "Inhabilitat"
+#: shell/main.c:185
+msgid "Disable splash screen"
+msgstr ""
 
-#: shell/main.c:195
+#: shell/main.c:186
+msgid "Send the debugging output of all components to a file."
+msgstr ""
+
+#: shell/main.c:219
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No es pot inicialitzar el sistema de components del Bonobo."
 
@@ -7146,8 +7510,7 @@ msgstr "Cerca un contacte"
 msgid "New contact"
 msgstr "Visualitza tots els contactes"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
 msgid "Previews the message to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
@@ -7155,7 +7518,7 @@ msgstr "Previsualitza el missatge que s'ha d'imprimir"
 msgid "Print contacts"
 msgstr "Imprimeix els contactes"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
 msgid "Stop"
 msgstr "Atura"
 
@@ -7181,7 +7544,7 @@ msgstr "Afegeix una font"
 msgid "_Contact"
 msgstr "_Contactes..."
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
 #: ui/evolution-contact-editor.xml.h:15
 #, fuzzy
 msgid "_Print..."
@@ -7191,9 +7554,9 @@ msgstr "Imprimeix..."
 msgid "_Search for contacts"
 msgstr "_Cerca contactes"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
+#: 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"
 msgstr "_Eines"
 
@@ -7206,126 +7569,166 @@ msgid "Alter preferences"
 msgstr "Modifica les prefer�ncies"
 
 #: ui/evolution-calendar.xml.h:4
+#, fuzzy
+msgid "Create a new all day Event"
+msgstr "Crea una nova agenda"
+
+#: ui/evolution-calendar.xml.h:5
 msgid "Create a new appointment"
 msgstr "Crea una nova cita"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Create a new calendar"
 msgstr "Crea una nova agenda"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Day"
 msgstr "Dia"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Go To"
 msgstr "V�s a"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Go back in time"
 msgstr "V�s enrera en el temps"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go forward in time"
 msgstr "V�s endavant en el temps"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
+#, 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
 msgid "Go to a specific date"
 msgstr "V�s a una data concreta"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to present time"
 msgstr "V�s al present"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
-msgid "New Appointment"
-msgstr "Nova cita..."
+msgid "New _Event"
+msgstr "Nova a_genda"
 
-#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
+#: 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:16
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Open Calendar"
 msgstr "_Obre una agenda"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:21
 msgid "Prev"
 msgstr "Anterior"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Previews the calendar to be printed"
+msgstr "Previsualitza el missatge que s'ha d'imprimir"
+
+#: ui/evolution-calendar.xml.h:25
 #, fuzzy
 msgid "Print calendar"
 msgstr "Imprimeix l'agenda"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Print this Calendar"
 msgstr "Imprimeix aquest agenda"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
 #, fuzzy
 msgid "Save As"
 msgstr "_Anomena i desa"
 
-#: ui/evolution-calendar.xml.h:24
+#: 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:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show 1 day"
 msgstr "Mostra 1 dia"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show 1 month"
 msgstr "Mostra 1 mes"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show 1 week"
 msgstr "Mostra 1 setmana"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Mostra la setmana de treball"
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
-#: widgets/misc/e-dateedit.c:413
+#: 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:31
+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "W_ork Week"
+msgstr "Setmana de treball"
+
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Setmana"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
 #, fuzzy
 msgid "_Appointment"
 msgstr "Cites:"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
+#: ui/evolution-calendar.xml.h:38
+#, fuzzy
+msgid "_Day"
+msgstr "Dia"
+
+#: ui/evolution-calendar.xml.h:39
+#, 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:34
+#: ui/evolution-calendar.xml.h:41
 msgid "_Open Calendar"
 msgstr "_Obre una agenda"
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
 #: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "_Save As..."
 msgstr "Anomena i desa..."
 
+#: ui/evolution-calendar.xml.h:45
+#, fuzzy
+msgid "_Week"
+msgstr "Setmana"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Suprimeix aquest element"
@@ -7351,7 +7754,7 @@ 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:35 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Imprimeix..."
 
@@ -7386,7 +7789,7 @@ 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:29
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
 msgid "_File"
 msgstr "_Fitxer"
 
@@ -7451,7 +7854,7 @@ msgstr "Suprimeix aquesta cita"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "Copia a la carpeta"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
+#: 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"
@@ -7555,7 +7958,7 @@ msgid "Print Setup"
 msgstr "Configuraci� de la p�gina:"
 
 #: 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
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Desa"
 
@@ -7579,7 +7982,8 @@ msgstr "Seleccioneu una carpeta"
 msgid "Schedule some sort of a meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:68
+#: ui/evolution-task-editor-dialog.xml.h:57
 #, fuzzy
 msgid "Select All"
 msgstr "Selecciona'ls _tots"
@@ -7605,13 +8009,13 @@ msgid "_About..."
 msgstr "_Quant a l'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:26
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
 #, fuzzy
 msgid "_Close"
 msgstr "Tanca"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_Contact (FIXME)"
 msgstr "_Contacte (FIXME)"
 
@@ -7626,7 +8030,7 @@ msgid "_Debug"
 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:33
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
 msgid "_Help"
 msgstr "_Ajuda"
 
@@ -7670,7 +8074,7 @@ msgstr "Enganxa"
 msgid "_Print"
 msgstr "_Imprimeix"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
 #: ui/evolution-task-editor-dialog.xml.h:83
 #, fuzzy
 msgid "_Properties..."
@@ -7682,7 +8086,7 @@ 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:40
+#: ui/evolution.xml.h:41
 msgid "_Task (FIXME)"
 msgstr "_Tasca (FIXME)"
 
@@ -7715,260 +8119,399 @@ msgid "New Mail"
 msgstr "Recupera el correu"
 
 #: ui/evolution-mail.xml.h:2
+msgid "Apply any new filters to the mail in this box"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:3
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:4
 msgid "Compose"
 msgstr "Redacta"
 
-#: ui/evolution-mail.xml.h:3
+#: ui/evolution-mail.xml.h:5
 msgid "Compose a new message"
 msgstr "Redacta un nou missatge"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Configure Folder..."
+msgstr "Mou a la carpeta"
+
+#: ui/evolution-mail.xml.h:8
 msgid "Copy message to a new folder"
 msgstr "Copia el missatge a una nova carpeta"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail.xml.h:9
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Copia el missatge a una nova carpeta"
+
+#: ui/evolution-mail.xml.h:10
 #, fuzzy
 msgid "Create _Virtual Folder From Message"
 msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Delete the selected messages"
+msgstr "Imprimeix el missatge seleccionat"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Display all of the message headers"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail.xml.h:15
+#, fuzzy
+msgid "Edit Message"
+msgstr "_Edita el missatge"
+
+#: ui/evolution-mail.xml.h:16
 #, fuzzy
-msgid "Empty Trash"
+msgid "Edit the current message"
+msgstr "l'hora actual"
+
+#: ui/evolution-mail.xml.h:17
+#, fuzzy
+msgid "Empty _Trash"
 msgstr "Dies buits:"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Expunge"
+msgstr "_Esborra"
+
+#: ui/evolution-mail.xml.h:19
 #, fuzzy
 msgid "Filter on Se_nder"
 msgstr "Filtre sobre el remitent"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:20
 #, fuzzy
 msgid "Filter on _Recipients"
 msgstr "Filtre sobre els destinataris"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:21
 #, fuzzy
 msgid "Filter on _Subject"
 msgstr "Filtre sobre l'assumpte"
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:22
+msgid "Finaly remove all mails tagged for deletion"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:23
 msgid "Forget _Passwords"
 msgstr "Oblida les _contrasenyes"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:25
 #, fuzzy
 msgid "Forward As"
 msgstr "Reenvia"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:27
+msgid "Forward the selected mail to someone"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:29
+#, fuzzy
+msgid "Forward this message in-line with your mail, so you can edit it"
+msgstr "Reenvia un missatge sense cap assumpte"
+
+#: ui/evolution-mail.xml.h:30
 #, fuzzy
-msgid "Full Headers"
+msgid "Full _Headers"
 msgstr "Cerca completa"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:31
+#, fuzzy
+msgid "Hide Deleted Messages"
+msgstr "Suprimeix el missatge"
+
+#: ui/evolution-mail.xml.h:32
 #, fuzzy
 msgid "Hide S_elected Messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:33
 #, fuzzy
 msgid "Hide _Deleted Messages"
 msgstr "Suprimeix el missatge"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:34
 #, fuzzy
 msgid "Hide _Read messages"
 msgstr "Missatge reenviat - %s"
 
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:35
 #, fuzzy
-msgid "Inline"
-msgstr "Visualitza en l�nia"
+msgid "Invert Selection"
+msgstr "_Inverteix la selecci�"
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:36
 #, fuzzy
 msgid "Manage _Subscriptions..."
 msgstr "Gestiona les subscripcions..."
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:37
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:38
 #, fuzzy
 msgid "Mark All as R_ead"
 msgstr "Mar_ca'l com a llegit"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:39
+#, fuzzy
+msgid "Mark As Read"
+msgstr "Mar_ca'l com a llegit"
+
+#: ui/evolution-mail.xml.h:40
+msgid "Mark As U_nread"
+msgstr "Marca'l com a per _llegir"
+
+#: ui/evolution-mail.xml.h:41
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Marca'l com a per _llegir"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:42
 #, fuzzy
-msgid "Message _Display"
-msgstr "Esborra la visualitzaci� del missatge"
+msgid "Mark the selected messages as having been read"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:43
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:44
 msgid "Move"
 msgstr "Mou"
 
-#: ui/evolution-mail.xml.h:29
+#: 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:33
+#: ui/evolution-mail.xml.h:46
+#, 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.xml.h:48
+#, fuzzy
+msgid "Open the current 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.xml.h:54
 msgid "Print message to the printer"
 msgstr "Imprimeix el missatge a la impressora"
 
-#: ui/evolution-mail.xml.h:36
-#, fuzzy
-msgid "Quoted"
-msgstr "Cap"
+#: ui/evolution-mail.xml.h:55
+msgid "Print message..."
+msgstr "Imprimeix el missatge..."
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:58
 msgid "Redirect (FIXME: implement me)"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:61
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:62
+#, fuzzy
+msgid "Reply to all"
+msgstr "Respon a tots"
+
+#: ui/evolution-mail.xml.h:64
+#, fuzzy
+msgid "Reply to sender"
+msgstr "Respon al remitent"
+
+#: ui/evolution-mail.xml.h:66
 #, fuzzy
 msgid "S_ource"
 msgstr "Font"
 
-#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "Save the message into a new file"
+msgstr "Desa el missatge a una carpeta determinada"
+
+#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:70
 #, fuzzy
 msgid "Select _Thread"
 msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Send and Receive"
+#: ui/evolution-mail.xml.h:71
+#, fuzzy
+msgid "Send / Receive"
+msgstr "Sendmail"
+
+#: ui/evolution-mail.xml.h:72
+msgid "Send a reply to the person who sent you this mail"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:73
+msgid "Send a single mail in reply to all the selected mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:74
+#, fuzzy
+msgid ""
+"Send queued mail\n"
+"    and retrieve new mail"
+msgstr "Envia el correu de la cua i recupera'n el nou"
+
+#: 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.xml.h:48
+#: ui/evolution-mail.xml.h:77
 #, fuzzy
 msgid "Show _All"
 msgstr "Mostra"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:79
 msgid "Threaded Message list"
 msgstr "Llista de missatges en cadena"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:80
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "Imprimeix el missatge seleccionat"
+
+#: ui/evolution-mail.xml.h:82
 msgid "VFolder on Se_nder"
 msgstr "VFolder sobre el remite_nt"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:83
 msgid "VFolder on _Recipients"
 msgstr "VFolder sobre els destinata_ris"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:84
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "VFolder sobre l'assumpte"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:85
 msgid "View Raw Message Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:86
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "Editor de carpetes _virtuals..."
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Actions"
-msgstr "_Accions"
-
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:87
 msgid "_Apply Filters"
 msgstr "_Aplica els filtres"
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:88
 #, fuzzy
-msgid "_Compose"
-msgstr "Redacta"
+msgid "_Attachment"
+msgstr "adjunci�"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:89
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:90
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:92
 msgid "_Expunge"
 msgstr "_Esborra"
 
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:93
 #, fuzzy
 msgid "_Filters..."
 msgstr "_Filtres de correu ..."
 
-#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:95
 msgid "_Forward"
 msgstr "_Reenvia"
 
-#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:96
+#, 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�"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:98
 #, fuzzy
 msgid "_Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:99
 #, fuzzy
 msgid "_Mail Settings..."
 msgstr "_Par�metres"
 
-#: ui/evolution-mail.xml.h:69
-#, fuzzy
-msgid "_Message Hiding"
-msgstr "_Missatge"
-
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail.xml.h:100
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "_Mou a la carpeta"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail.xml.h:101
 #, fuzzy
 msgid "_Open Selected Items"
 msgstr "Obre la tasca"
 
-#: ui/evolution-mail.xml.h:74
-msgid "_Send and Receive"
-msgstr ""
+#: ui/evolution-mail.xml.h:103
+#, fuzzy
+msgid "_Quoted"
+msgstr "Cap"
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail.xml.h:104
+#, fuzzy
+msgid "_Reply"
+msgstr "Respon"
+
+#: ui/evolution-mail.xml.h:105
+#, fuzzy
+msgid "_Resend Messages"
+msgstr "_Edita el missatge"
+
+#: ui/evolution-mail.xml.h:107
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "_Anomena i desa..."
+
+#: ui/evolution-mail.xml.h:108
+#, fuzzy
+msgid "_Send / Receive"
+msgstr "Sendmail"
+
+#: ui/evolution-mail.xml.h:109
 msgid "_Threaded"
 msgstr "_En cadena"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:111
 #, fuzzy
 msgid "_Undelete"
 msgstr "_Suprimeix"
@@ -8252,7 +8795,7 @@ msgstr "_Envia"
 msgid "Undo the last action"
 msgstr "Elimina una acci�"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
 msgid "_Appointment (FIXME)"
 msgstr "_Cita (FIXME)"
 
@@ -8390,123 +8933,135 @@ msgstr "S'est� movent"
 msgid "_About Evolution..."
 msgstr "_Quant a l'Evolution..."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:25
+msgid "_Actions"
+msgstr "_Accions"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Carpeta"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:33
 msgid "_Go to Folder..."
 msgstr "_V�s a la carpeta..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Import file..."
 msgstr "_Insereix el fitxer de text... (FIXME)"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:36
 msgid "_Index"
 msgstr "_�ndex"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:37
 #, fuzzy
 msgid "_Mail message"
 msgstr "Missatge de _correu (FIXME)"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_New Folder"
 msgstr "Nova VFolder"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
 #. 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:2475
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+msgid "Tentative"
+msgstr "Tentatiu"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Ocupat"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "Fora de l'oficina"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Cap informaci�"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
 msgid "_Invite Others..."
 msgstr "_Invita a altres..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
 msgid "_Options"
 msgstr "_Opcions"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
 msgid "Show _Only Working Hours"
 msgstr "Mostra _nom�s les hores de treball"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
 msgid "Show _Zoomed Out"
 msgstr "Mostra-ho reduint el zoom"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
 msgid "_Update Free/Busy"
 msgstr "_Actualitza lliure/ocupat"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr "Tria autom�tica"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
 msgid "_All People and Resources"
 msgstr "_Totes les persones i recursos"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
 msgid "All _People and One Resource"
 msgstr "Totes les persones i un recurs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
 msgid "_Required People"
 msgstr "Persones _requerides"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
 msgid "Required People and _One Resource"
 msgstr "Persones requerides i _un recurs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
 msgid "Meeting _start time:"
 msgstr "Hora d'_inici de la reuni�:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
 msgid "Meeting _end time:"
 msgstr "Hora de _finalitzaci� de la reuni�:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
 msgid "All Attendees"
 msgstr "Tots els assistents"
 
-#: widgets/menus/gal-view-menus.c:171
+#: widgets/menus/gal-view-menus.c:177
 #, fuzzy
 msgid "_Current View"
 msgstr "l'hora actual"
 
+#: widgets/menus/gal-view-menus.c:196
+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
@@ -8518,99 +9073,112 @@ msgstr "DDDDDDD"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
 msgid "Now"
 msgstr "Ara"
 
-#: widgets/misc/e-cell-date-edit.c:239
+#: widgets/misc/e-cell-date-edit.c:242
 msgid "OK"
 msgstr ""
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#.
-#: widgets/misc/e-cell-date-edit.c:460
-#, fuzzy
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S%n"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
-#: 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"
-
-#. strftime format of a time in 12-hour format.
-#.
-#: widgets/misc/e-cell-date-edit.c:469
-#, fuzzy
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p%n"
-
-#. FIXME: Better message needed.
-#: widgets/misc/e-cell-date-edit.c:736
-msgid "The time is invalid"
+#: widgets/misc/e-cell-date-edit.c:723
+#, fuzzy, c-format
+msgid "The time must be in the format: %s"
 msgstr ""
+"La data s'ha d'introduir amb el format: \n"
+"\n"
+"%s"
 
 #: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:160
+#: widgets/misc/e-filter-bar.c:166
 #, fuzzy
 msgid "Save Search"
 msgstr "Cerca"
 
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:237
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Afegeix..."
 
-#: widgets/misc/e-filter-bar.c:311
+#: widgets/misc/e-filter-bar.c:317
 #, fuzzy
 msgid "Advanced ..."
 msgstr "Afegeix..."
 
-#: widgets/misc/e-messagebox.c:141
+#: widgets/misc/e-messagebox.c:152
 #, fuzzy
 msgid "Information"
 msgstr "Cap informaci�"
 
-#: widgets/misc/e-messagebox.c:148
+#: widgets/misc/e-messagebox.c:159
 #, fuzzy
 msgid "Warning"
 msgstr "S'est� movent"
 
-#: widgets/misc/e-messagebox.c:162
+#: widgets/misc/e-messagebox.c:173
 #, fuzzy
 msgid "Question"
 msgstr "Descripci�:"
 
-#: widgets/misc/e-messagebox.c:169
+#: widgets/misc/e-messagebox.c:180
 #, fuzzy
 msgid "Message"
 msgstr "_Missatge"
 
 #. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
+#: widgets/misc/e-messagebox.c:224
 #, fuzzy
 msgid "Don't show this message again."
 msgstr "Envia aquest missatge"
 
-#: widgets/misc/e-search-bar.c:140
+#: widgets/misc/e-search-bar.c:148
 #, fuzzy
 msgid "Sear_ch"
 msgstr "Cerca"
 
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Adress 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"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
 msgid "The Personal Addressbook Server"
@@ -8620,22 +9188,209 @@ msgstr "Afegeix una font"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:153
+#: wombat/wombat.c:173
 #, fuzzy
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: wombat/wombat.c:165
+#: wombat/wombat.c:185
 #, fuzzy
 msgid "init_corba(): could not initialize GNOME"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: wombat/wombat.c:178
+#: wombat/wombat.c:198
 #, fuzzy
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #, fuzzy
+#~ msgid "Click here to add a contact"
+#~ msgstr "<feu clic aqu� per seleccionar una data>"
+
+#, fuzzy
+#~ msgid ""
+#~ "This option will connect to the server using a the PLAIN SASL mechanism if "
+#~ "the server supports it."
+#~ msgstr ""
+#~ "Aquesta opci� es connectar� al servidor IMAP mitjan�ant una contrasenya de "
+#~ "text net."
+
+#~ msgid "No such host %s."
+#~ msgstr "L'ordinador central %s no existeix."
+
+#~ msgid "Temporarily unable to look up hostname %s."
+#~ msgstr "Temporalment no es pot cercar el nom d'ordinador central %s."
+
+#~ msgid "URL string `%s' contains no protocol"
+#~ msgstr "La cadena d'URL `%s' no cont� cap protocol"
+
+#~ msgid "URL string `%s' contains an invalid protocol"
+#~ msgstr "La cadena d'URL `%s' cont� un protocol incorrecte"
+
+#~ msgid "Port number in URL `%s' is non-numeric"
+#~ 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."
+
+#, fuzzy
+#~ 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 ""
+#~ "Per connectar als servidors POP. El protocol POP tamb� es pot utilitzar per "
+#~ "recuperar correu des de determinats prove�dors de correu web i sistemes "
+#~ "propietaris de correu."
+
+#, fuzzy
+#~ msgid ""
+#~ "For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+#~ "connection.\n"
+#~ msgstr ""
+#~ "Per al lliurament de correu mitjan�ant la connexi� a un concentrador de "
+#~ "correu utilitzant SMTP."
+
+#, fuzzy
+#~ msgid "No authentication required"
+#~ msgstr "Autenticaci�:"
+
+#, fuzzy
+#~ 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 ""
+#~ "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"
+
+#, fuzzy
+#~ msgid "Advanced"
+#~ msgstr "Afegeix..."
+
+#, fuzzy
+#~ msgid "Check settings"
+#~ msgstr "Par�metres de prova"
+
+#~ msgid "Email address:"
+#~ msgstr "Adre�a electr�nica:"
+
+#, fuzzy
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Configuraci� del correu"
+
+#, fuzzy
+#~ msgid "Hostname:"
+#~ msgstr "Nom d'usuari:"
+
+#, fuzzy
+#~ msgid "IMAP"
+#~ msgstr "IMAPv4"
+
+#, fuzzy
+#~ msgid "Keep mail on server"
+#~ msgstr "No suprimeixis els missatges del servidor"
+
+#, fuzzy
+#~ msgid "Mail"
+#~ msgstr "_Correu"
+
+#, fuzzy
+#~ msgid "Mail Account"
+#~ msgstr "cont�"
+
+#, fuzzy
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Configuraci� del correu"
+
+#, fuzzy
+#~ msgid "Optional"
+#~ msgstr "Opcions"
+
+#, fuzzy
+#~ msgid "Password:"
+#~ msgstr "Contrasenya"
+
+#, fuzzy
+#~ msgid "Remember my password"
+#~ msgstr "Desa com a VCard"
+
+#, fuzzy
+#~ msgid "Reply address:"
+#~ msgstr "Adre�a electr�nica:"
+
+#, fuzzy
+#~ msgid "Required"
+#~ msgstr "Persones _requerides"
+
+#, fuzzy
+#~ msgid "Save password"
+#~ 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"
+
+#, fuzzy
+#~ msgid "Transport Authentication"
+#~ msgstr "Autenticaci�:"
+
+#, fuzzy
+#~ msgid "minutes."
+#~ msgstr "minuts"
+
+#~ msgid "%s message %d of %d (uid \"%s\")"
+#~ msgstr "%s missatge %d de %d (uid \"%s\")"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "_Message Hiding"
+#~ msgstr "_Missatge"
+
+#, fuzzy
 #~ msgid "Copyright (C) 2000, Helix Code, Inc."
 #~ msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
@@ -8651,10 +9406,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "el disc local."
 
 #, fuzzy
-#~ msgid "Connecting to server"
-#~ msgstr "Connexi� de prova a \"%s\""
-
-#, fuzzy
 #~ msgid "Connect to server"
 #~ msgstr "No s'ha pogut connectar al servidor POP en %s."
 
@@ -8844,12 +9595,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Registering local folder"
 #~ msgstr "Creaci� d'una nova carpeta"
 
-#, fuzzy
-#~ msgid ""
-#~ "Unable to register folder '%s':\n"
-#~ "%s"
-#~ msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
-
 #~ msgid "Fetching email from %s"
 #~ msgstr "S'est� recollint el correu des de %s"
 
@@ -8935,9 +9680,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Retrieving message %d of %d"
 #~ msgstr "S'est� recuperant el missatge %d de %d"
 
-#~ msgid "Writing message %d of %d"
-#~ msgstr "S'est� escrivint el missatge %d de %d"
-
 #~ msgid "Saving changes to %s"
 #~ msgstr "S'estan desant els canvis a %s"
 
@@ -8949,10 +9691,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "%s"
 
 #, fuzzy
-#~ msgid "Subscribe to folder \"%s\""
-#~ msgstr "Escaneja les carpetes de \"%s\""
-
-#, fuzzy
 #~ msgid "Unsubscribe from folder \"%s\""
 #~ msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
@@ -9215,12 +9953,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Server:"
 #~ msgstr "Servidor:"
 
-#~ msgid "Detect supported types..."
-#~ msgstr "Detecta els tipus suportats..."
-
-#~ msgid "Don't delete messages from server"
-#~ msgstr "No suprimeixis els missatges del servidor"
-
 #~ msgid "Mail source type:"
 #~ msgstr "Tipus de font del correu:"
 
@@ -9283,9 +10015,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Edit News Server"
 #~ msgstr "Edita el servidor de not�cies"
 
-#~ msgid "Testing \"%s\""
-#~ msgstr "S'est� comprovant \"%s\""
-
 #~ msgid "The connection was successful!"
 #~ msgstr "La connexi� ha tingut �xit!"
 
@@ -9368,18 +10097,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Filter on Rec_ipients"
 #~ msgstr "Filtre sobre els dest_inataris"
 
-#~ msgid "Mar_k As Read"
-#~ msgstr "Mar_ca'l com a llegit"
-
-#~ msgid "Mark As U_nread"
-#~ msgstr "Marca'l com a per _llegir"
-
-#~ msgid "Print Preview of message..."
-#~ msgstr "Previsualitzaci� d'impressi� del missatge..."
-
-#~ msgid "Print message..."
-#~ msgstr "Imprimeix el missatge..."
-
 #~ msgid "Reply to _Sender"
 #~ msgstr "Respon al _remitent"
 
@@ -9387,9 +10104,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Show _All messages"
 #~ msgstr "Mostra"
 
-#~ msgid "_Edit Message"
-#~ msgstr "_Edita el missatge"
-
 #~ msgid "_Filter on Subject"
 #~ msgstr "_Filtre sobre l'assumpte"
 
@@ -9403,10 +10117,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "_Imprimeix el missatge"
 
 #, fuzzy
-#~ msgid "_Save Message As..."
-#~ msgstr "_Anomena i desa..."
-
-#, fuzzy
 #~ msgid "_Source"
 #~ msgstr "Font"
 
@@ -9416,9 +10126,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Show the _Folder Bar"
 #~ msgstr "Mostra la barra de _carpetes"
 
-#~ msgid "Available Categories:"
-#~ msgstr "Categories disponibles:"
-
 #~ msgid "External Directories"
 #~ msgstr "Directoris externs"
 
@@ -9575,9 +10282,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Mark messages in folder \"%s\""
 #~ msgstr "Marca els missatges de la carpeta \"%s\""
 
-#~ msgid "Marking message %d of %d"
-#~ msgstr "S'est� marcant el missatge %d de %d"
-
 #~ msgid "Scan folders in \"%s\""
 #~ msgstr "Escaneja les carpetes de \"%s\""
 
@@ -9593,9 +10297,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Forward message \"%s\""
 #~ msgstr "Reenvia el missatge \"%s\""
 
-#~ msgid "Forward a message without a subject"
-#~ msgstr "Reenvia un missatge sense cap assumpte"
-
 #~ msgid ""
 #~ "Failed to generate mime part from message while generating forwarded message."
 #~ msgstr ""
@@ -9747,9 +10448,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Highlight not yet due items"
 #~ msgstr "Ressalta els elements que encara no han ven�ut"
 
-#~ msgid "Highlight items due today"
-#~ msgstr "Ressalta els elemts que vencen avui"
-
 #~ msgid "To Do List"
 #~ msgstr "Llista de coses per fer"
 
@@ -9774,9 +10472,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Could not create summary"
 #~ msgstr "No s'ha pogut crear el resum"
 
-#~ msgid "Cannot get message: %s"
-#~ msgstr "No es pot recuperar el missatge: %s"
-
 #~ msgid "Could not rename folder %s to %s: destination exists"
 #~ msgstr ""
 #~ "No s'ha pogut canviar el nom de la carpeta %s a %s: el nom de dest� ja "
@@ -9836,18 +10531,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 "Open in New Window"
-#~ msgstr "Obre'l en una nova finestra"
-
 #~ msgid "Forward Message"
 #~ msgstr "Reenvia el missatge"
 
 #~ msgid "Copy Message"
 #~ msgstr "Copia el missatge"
 
-#~ msgid "New Ca_lendar"
-#~ msgstr "Nova a_genda"
-
 #~ msgid "_New appointment..."
 #~ msgstr "_Nova cita..."
 
@@ -9977,9 +10666,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "_Format"
 #~ msgstr "_Formata"
 
-#~ msgid "Check for new mail"
-#~ msgstr "Comprova si hi ha nou correu"
-
 #~ msgid "Currently pending operations:"
 #~ msgstr "Operacions encara pendents:"
 
diff --git a/po/da.po b/po/da.po
index 6c6a943a0e..ae37bfc73f 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-03-15 11:05+0100\n"
+"POT-Creation-Date: 2001-04-14 08:51-0400\n"
 "PO-Revision-Date: 2001-04-03 10:38+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -14,11 +14,11 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3269
+#: addressbook/backend/ebook/e-card.c:3209
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3271
+#: addressbook/backend/ebook/e-card.c:3211
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +26,7 @@ msgstr ""
 "\n"
 "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3272
+#: addressbook/backend/ebook/e-card.c:3212
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +34,7 @@ msgstr ""
 "\n"
 "Prefiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3273
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +42,7 @@ msgstr ""
 "\n"
 "Opgivet:     "
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3214
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +50,7 @@ msgstr ""
 "\n"
 "Till�g: "
 
-#: addressbook/backend/ebook/e-card.c:3275
+#: addressbook/backend/ebook/e-card.c:3215
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +58,7 @@ msgstr ""
 "\n"
 "Familie:    "
 
-#: addressbook/backend/ebook/e-card.c:3276
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +66,7 @@ msgstr ""
 "\n"
 "Suffiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3290
+#: addressbook/backend/ebook/e-card.c:3230
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +74,7 @@ msgstr ""
 "\n"
 "F�dselsdato: "
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3241
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +82,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3303
+#: addressbook/backend/ebook/e-card.c:3243
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,7 +90,7 @@ msgstr ""
 "\n"
 "Postboks:  "
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3244
 msgid ""
 "\n"
 "  Ext:         "
@@ -98,7 +98,7 @@ msgstr ""
 "\n"
 "Linje:         "
 
-#: addressbook/backend/ebook/e-card.c:3305
+#: addressbook/backend/ebook/e-card.c:3245
 msgid ""
 "\n"
 "  Street:      "
@@ -106,7 +106,7 @@ msgstr ""
 "\n"
 "Vej:     "
 
-#: addressbook/backend/ebook/e-card.c:3306
+#: addressbook/backend/ebook/e-card.c:3246
 msgid ""
 "\n"
 "  City:        "
@@ -114,7 +114,7 @@ msgstr ""
 "\n"
 "By:          "
 
-#: addressbook/backend/ebook/e-card.c:3307
+#: addressbook/backend/ebook/e-card.c:3247
 msgid ""
 "\n"
 "  Region:      "
@@ -122,7 +122,7 @@ msgstr ""
 "\n"
 "Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3308
+#: addressbook/backend/ebook/e-card.c:3248
 msgid ""
 "\n"
 "  Postal Code: "
@@ -130,7 +130,7 @@ msgstr ""
 "\n"
 "Postnummer: "
 
-#: addressbook/backend/ebook/e-card.c:3309
+#: addressbook/backend/ebook/e-card.c:3249
 msgid ""
 "\n"
 "  Country:     "
@@ -138,7 +138,7 @@ msgstr ""
 "\n"
 "Land:    "
 
-#: addressbook/backend/ebook/e-card.c:3322
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "Delivery Label: "
@@ -146,7 +146,7 @@ msgstr ""
 "\n"
 "Leveringsm�rke: "
 
-#: addressbook/backend/ebook/e-card.c:3334
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "Telephones:\n"
@@ -154,7 +154,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3277
 msgid ""
 "\n"
 "Telephone:"
@@ -162,7 +162,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3361
+#: addressbook/backend/ebook/e-card.c:3301
 msgid ""
 "\n"
 "E-mail:\n"
@@ -170,7 +170,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3364
+#: addressbook/backend/ebook/e-card.c:3304
 msgid ""
 "\n"
 "E-mail:"
@@ -178,7 +178,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3383
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Mailer: "
@@ -186,7 +186,7 @@ msgstr ""
 "\n"
 "E-post program: "
 
-#: addressbook/backend/ebook/e-card.c:3389
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "Time Zone: "
@@ -194,7 +194,7 @@ msgstr ""
 "\n"
 "Tidszone: "
 
-#: addressbook/backend/ebook/e-card.c:3397
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Geo Location: "
@@ -202,7 +202,7 @@ msgstr ""
 "\n"
 "Geografisk lokation: "
 
-#: addressbook/backend/ebook/e-card.c:3401
+#: addressbook/backend/ebook/e-card.c:3341
 msgid ""
 "\n"
 "Business Role: "
@@ -210,7 +210,7 @@ msgstr ""
 "\n"
 "Stilling: "
 
-#: addressbook/backend/ebook/e-card.c:3413
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "Org: "
@@ -218,7 +218,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3414
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Name:  "
@@ -226,7 +226,7 @@ msgstr ""
 "\n"
 "Navn:  "
 
-#: addressbook/backend/ebook/e-card.c:3415
+#: addressbook/backend/ebook/e-card.c:3355
 msgid ""
 "\n"
 "  Unit:  "
@@ -234,7 +234,7 @@ msgstr ""
 "\n"
 "Enhed:  "
 
-#: addressbook/backend/ebook/e-card.c:3416
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "  Unit2: "
@@ -242,7 +242,7 @@ msgstr ""
 "\n"
 "Enhed2: "
 
-#: addressbook/backend/ebook/e-card.c:3417
+#: addressbook/backend/ebook/e-card.c:3357
 msgid ""
 "\n"
 "  Unit3: "
@@ -250,7 +250,7 @@ msgstr ""
 "\n"
 "Enhed3: "
 
-#: addressbook/backend/ebook/e-card.c:3418
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Unit4: "
@@ -258,7 +258,7 @@ msgstr ""
 "\n"
 "Enhed4: "
 
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3362
 msgid ""
 "\n"
 "Categories: "
@@ -266,7 +266,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3423
+#: addressbook/backend/ebook/e-card.c:3363
 msgid ""
 "\n"
 "Comment: "
@@ -284,7 +284,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3436
+#: addressbook/backend/ebook/e-card.c:3376
 msgid ""
 "\n"
 "Unique String: "
@@ -292,7 +292,7 @@ msgstr ""
 "\n"
 "Unik streng: "
 
-#: addressbook/backend/ebook/e-card.c:3439
+#: addressbook/backend/ebook/e-card.c:3379
 msgid ""
 "\n"
 "Public Key: "
@@ -312,11 +312,11 @@ msgstr "Importerer GnomeCard-filer ind i Evolution."
 #: 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:1089
+#: 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:54
+#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
 
@@ -328,20 +328,20 @@ msgstr "Mark�ren kunne ikke indl�ses\n"
 msgid "EBook not loaded\n"
 msgstr "EBook ikke indl�st\n"
 
-#: addressbook/conduit/address-conduit.c:651
+#: addressbook/conduit/address-conduit.c:654
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat-tjener"
 
-#: addressbook/conduit/address-conduit.c:652
+#: addressbook/conduit/address-conduit.c:655
 #: calendar/conduits/calendar/calendar-conduit.c:732
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte 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 "Kunne ikke l�se pilotens adresseapplikationsblok"
 
@@ -406,7 +406,7 @@ msgid "Phone Types"
 msgstr "Telefontyper"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "Primary Email"
 msgstr "Prim�r epost"
 
@@ -445,7 +445,7 @@ msgstr "_Firma:"
 
 #: 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
+#: ui/evolution-mail.xml.h:91 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Slet"
 
@@ -497,110 +497,105 @@ msgstr "_Dette er postadressen"
 msgid "Delete Contact?"
 msgstr "Slet kontakt?"
 
-#: addressbook/contact-editor/e-contact-editor.c:592
+#: addressbook/contact-editor/e-contact-editor.c:603
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakt tilh�rer disse kategorier:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#: addressbook/gui/widgets/e-addressbook-view.c:626
+#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/widgets/e-addressbook-view.c:676
 msgid "Assistant"
 msgstr "Sekret�r"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#: addressbook/contact-editor/e-contact-editor.c:1299
-#: addressbook/gui/widgets/e-addressbook-view.c:606
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1310
 msgid "Business"
 msgstr "Arbejde"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
-#: addressbook/gui/widgets/e-addressbook-view.c:613
+#: addressbook/contact-editor/e-contact-editor.c:1244
 msgid "Business 2"
 msgstr "Arbejde 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#: addressbook/gui/widgets/e-addressbook-view.c:611
+#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Business Fax"
 msgstr "Firma fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Callback"
 msgstr "Tilbagering"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
-#: addressbook/gui/widgets/e-addressbook-view.c:610
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/contact-editor/e-contact-editor.c:1248
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
-#: addressbook/contact-editor/e-contact-editor.c:1300
-#: addressbook/gui/widgets/e-addressbook-view.c:607
+#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1311
 msgid "Home"
 msgstr "Hjem"
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
-#: addressbook/gui/widgets/e-addressbook-view.c:614
+#: addressbook/contact-editor/e-contact-editor.c:1250
 msgid "Home 2"
 msgstr "Hjem 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
-#: addressbook/gui/widgets/e-addressbook-view.c:612
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Home Fax"
 msgstr "Hjemme fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/gui/widgets/e-addressbook-view.c:615
+#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "ISDN"
 msgstr "Isdn"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:609
+#: addressbook/contact-editor/e-contact-editor.c:1253
 msgid "Mobile"
 msgstr "_Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1301
-#: addressbook/gui/widgets/e-addressbook-view.c:616
+#: 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"
 msgstr "Andet"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:662
 msgid "Other Fax"
 msgstr "Anden fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:617
+#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Pager"
 msgstr "Kalder"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/contact-editor/e-contact-editor.c:1257
 msgid "Primary"
 msgstr "Prim�r epost"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/gui/widgets/e-addressbook-view.c:664
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/widgets/e-addressbook-view.c:665
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1260
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:618
+#: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:668
 msgid "Email 2"
 msgstr "Sekund�r epost"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/gui/widgets/e-addressbook-view.c:619
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/gui/widgets/e-addressbook-view.c:669
 msgid "Email 3"
 msgstr "Terti�r epost"
 
@@ -613,6 +608,7 @@ msgid "Edit Full"
 msgstr "Redig�r alt"
 
 #: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/widgets/e-addressbook-view.c:643
 msgid "Full Name"
 msgstr "Fuldt navn"
 
@@ -794,7 +790,7 @@ msgstr "Epost indeholder"
 msgid "The URI that the Folder Browser will display"
 msgstr "Uri'en som mappebladreren vil vise"
 
-#: addressbook/gui/component/addressbook-storage.c:95
+#: addressbook/gui/component/addressbook-storage.c:99
 msgid "Other Contacts"
 msgstr "Andre kontakter"
 
@@ -944,12 +940,14 @@ msgid "Addressbook Sources"
 msgstr "Kilder til adressebog"
 
 #: 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:577
+#: 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:6 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Slet"
 
@@ -960,7 +958,6 @@ msgid "Edit"
 msgstr "Redig�r"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Name"
 msgstr "Navn"
 
@@ -1039,9 +1036,9 @@ 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:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:396
-#: filter/filter-rule.c:541 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:252 shell/e-shortcuts-view.c:375
+#: 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 "Fjern"
 
@@ -1065,7 +1062,7 @@ msgstr "V�lg mappe"
 msgid "Select name from:"
 msgstr "V�lg navn fra:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
 msgid "Search"
 msgstr "S�g"
 
@@ -1177,72 +1174,175 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
-#: addressbook/gui/widgets/e-minicard.c:449
+#: 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
 msgid "Save as VCard"
 msgstr "Gem som vCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-minicard.c:669
+#, fuzzy
+msgid "Send contact to other"
+msgstr "Send _kontaktperson til andre..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-minicard.c:670
+#, fuzzy
+msgid "Send message to contact"
+msgstr "Ny _meddelelse til kontaktperson"
+
+#: 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
+msgid "Print"
+msgstr "Udskriv"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-minicard.c:672
+#, fuzzy
+msgid "Print Envelope"
+msgstr "Skriv kuvert..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:641
 msgid "* Click here to add a contact *"
 msgstr "* Klik her for at tilf�je en kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: addressbook/gui/widgets/e-addressbook-view.c:642
+#, fuzzy
+msgid "File As"
+msgstr "Gem som:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:644
 msgid "Email"
 msgstr "Epost"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:608
+#: addressbook/gui/widgets/e-addressbook-view.c:645
+#, fuzzy
+msgid "Primary Phone"
+msgstr "Prim�r epost"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:646
+#, fuzzy
+msgid "Assistant Phone"
+msgstr "Sekret�r"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:647
+#, fuzzy
+msgid "Business Phone"
+msgstr "Arbejde 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:648
+#, fuzzy
+msgid "Callback Phone"
+msgstr "Tilbagering"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:649
+#, fuzzy
+msgid "Company Phone"
+msgstr "Firma"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:650
+#, fuzzy
+msgid "Home Phone"
+msgstr "Hjem 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:651
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:620
+#: addressbook/gui/widgets/e-addressbook-view.c:652
+#, fuzzy
+msgid "Business Address"
+msgstr "Arbejde 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:653
+#, fuzzy
+msgid "Home Address"
+msgstr "Adresse"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:654
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "_Mobil"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:658
+#, fuzzy
+msgid "Business Phone 2"
+msgstr "Arbejde 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:659
+#, fuzzy
+msgid "Home Phone 2"
+msgstr "Hjem 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:661
+#, fuzzy
+msgid "Other Phone"
+msgstr "Andre kontakter"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:666
+#, fuzzy
+msgid "TTY"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:667
+#, fuzzy
+msgid "Other Address"
+msgstr "Tjek adresse"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:670
 msgid "Web Site"
 msgstr "Netsted"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:621
+#: addressbook/gui/widgets/e-addressbook-view.c:671
 msgid "Department"
 msgstr "Afdeling"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:622
+#: addressbook/gui/widgets/e-addressbook-view.c:672
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:623
+#: addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:674
 msgid "Profession"
 msgstr "Profession"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:625
+#: addressbook/gui/widgets/e-addressbook-view.c:675
 msgid "Manager"
 msgstr "Foresatte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:627
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 msgid "Nickname"
 msgstr "Kaldenavn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:628
+#: addressbook/gui/widgets/e-addressbook-view.c:678
 msgid "Spouse"
 msgstr "Samlever"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:629
+#: addressbook/gui/widgets/e-addressbook-view.c:679
 msgid "Note"
 msgstr "Bem�rkning"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:630
+#: addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Free-busy URL"
 msgstr "Ledig-optaget URL"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:631
-msgid "Click here to add a contact"
-msgstr "Klik her for at tilf�je en kontakt"
-
 #: addressbook/gui/widgets/e-minicard-control.c:282
 msgid "Save in addressbook"
 msgstr "Kunne ikke �bne adressebogen"
 
-#: addressbook/gui/widgets/e-minicard-view.c:146
+#: addressbook/gui/widgets/e-minicard-view.c:166
 msgid ""
 "\n"
 "\n"
@@ -1425,10 +1525,6 @@ msgstr "Type:"
 msgid "Width:"
 msgstr "Bredde:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "etiket26"
-
 #: calendar/conduits/calendar/calendar-conduit.c:687
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
@@ -1444,127 +1540,127 @@ msgstr "Kunne ikke l�se pilotens kalenderapplikationsblok"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke l�se pilotens applikationsblok for opgaveliste"
 
-#: calendar/gui/calendar-commands.c:264
+#: calendar/gui/calendar-commands.c:266
 msgid "File not found"
 msgstr "Fil ikke fundet"
 
-#: calendar/gui/calendar-commands.c:288
+#: calendar/gui/calendar-commands.c:290
 msgid "Open calendar"
 msgstr "�bn kalender"
 
-#: calendar/gui/calendar-commands.c:330
+#: calendar/gui/calendar-commands.c:332
 msgid "Save calendar"
 msgstr "Gem kalender"
 
-#: calendar/gui/calendar-commands.c:466
+#: calendar/gui/calendar-commands.c:468
 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:366 calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
 #: calendar/gui/e-calendar-table.c:330
 msgid "Public"
 msgstr "Of_fentlig"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
 #: calendar/gui/e-calendar-table.c:331
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
 #: calendar/gui/e-calendar-table.c:332
 msgid "Confidential"
 msgstr "_Fortrolig"
 
-#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
-#: calendar/gui/event-editor.c:1617
+#: 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
 msgid "Unknown"
 msgstr "Ukendt fejl"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "E"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: 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:629
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
 msgid "High"
 msgstr "H�j"
 
-#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
-#: calendar/gui/calendar-model.c:1596
+#: 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:628
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: 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:627
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
 msgid "Low"
 msgstr "Lav"
 
-#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
 #: calendar/gui/e-calendar-table.c:406
 msgid "Transparent"
 msgstr "Gennemsigtig"
 
-#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
 #: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
 msgstr "Uigennemsigtig"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: 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
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: 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
 msgid "In Progress"
 msgstr "Under udarbejdelse"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: 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
 msgid "Completed"
 msgstr "Fuldf�rt"
 
-#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: 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:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
+#: camel/camel-service.c:586
 msgid "Cancelled"
 msgstr "Afbrudt"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
 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:800 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:805
+#: calendar/gui/calendar-model.c:799
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1575,7 +1671,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:885
+#: calendar/gui/calendar-model.c:879
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -1583,17 +1679,17 @@ msgstr ""
 "'Ingen'"
 
 #. 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:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-accounts.c:120
-#: mail/mail-accounts.c:164 mail/mail-config.glade.h:37
-#: shell/e-shell-view.c:1121 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: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
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:967
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1603,40 +1699,40 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1013
+#: calendar/gui/calendar-model.c:1007
 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:1054
+#: calendar/gui/calendar-model.c:1048
 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:1067
+#: calendar/gui/calendar-model.c:1061
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 #: calendar/gui/e-calendar-table.c:355
 msgid "Undefined"
 msgstr "Udefineret"
 
-#: calendar/gui/calendar-model.c:1108
+#: calendar/gui/calendar-model.c:1102
 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:1598
+#: calendar/gui/calendar-model.c:1571
 msgid "Recurring"
 msgstr "Gentages"
 
-#: calendar/gui/calendar-model.c:1600
+#: calendar/gui/calendar-model.c:1573
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 msgid "No"
 msgstr "Nej"
 
@@ -1701,7 +1797,7 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:49
+#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikke initiere Gnome"
 
@@ -1827,7 +1923,7 @@ msgid "Fri"
 msgstr "fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
 msgid "Friday"
 msgstr "fredag"
 
@@ -1856,7 +1952,7 @@ msgid "Mon"
 msgstr "man"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
 msgid "Monday"
 msgstr "mandag"
 
@@ -1892,7 +1988,7 @@ msgid "Sat"
 msgstr "l�r"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:482
 msgid "Saturday"
 msgstr "l�rdag"
 
@@ -1917,7 +2013,7 @@ msgid "Sun"
 msgstr "s�n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:483
 msgid "Sunday"
 msgstr "s�ndag"
 
@@ -1930,7 +2026,7 @@ msgid "Thu"
 msgstr "tor"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
 msgid "Thursday"
 msgstr "torsdag"
 
@@ -1951,7 +2047,7 @@ msgid "Tue"
 msgstr "tir"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
 msgid "Tuesday"
 msgstr "tirsdag"
 
@@ -1964,7 +2060,7 @@ msgid "Wed"
 msgstr "ons"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
 msgid "Wednesday"
 msgstr "onsdag"
 
@@ -1981,30 +2077,30 @@ msgstr "minutter f�r de skal ske."
 msgid "seconds."
 msgstr "sekunder."
 
-#: calendar/gui/dialogs/delete-comp.c:68
+#: calendar/gui/dialogs/delete-comp.c:70
 #, 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:71
+#: calendar/gui/dialogs/delete-comp.c:73
 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:77
+#: calendar/gui/dialogs/delete-comp.c:79
 #, 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:80
+#: calendar/gui/dialogs/delete-comp.c:82
 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:86
+#: calendar/gui/dialogs/delete-comp.c:88
 #, 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:89
+#: calendar/gui/dialogs/delete-comp.c:91
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker p� at du vil slette denne unavngivne journalindgang?"
 
@@ -2089,21 +2185,21 @@ msgstr "_Status:"
 msgid "Edit Task"
 msgstr "Redig�r opgave"
 
-#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:377
+#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:383
+#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
 #, c-format
 msgid "Appointment - %s"
 msgstr "Aftale - %s"
 
-#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
 #, c-format
 msgid "Task - %s"
 msgstr "Opgave - %s"
 
-#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:389
+#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journalpunkt - %s"
@@ -2232,84 +2328,84 @@ msgstr "Slet denne opgave"
 msgid "Delete the task"
 msgstr "Slet opgaven"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: 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:271 calendar/gui/e-day-view.c:1281
-#: calendar/gui/e-week-view-main-item.c:321
+#: 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"
 
 #. 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
+#: 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:279 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:344
+#: 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"
 
 #. 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
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:617
 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
+#: 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-day-view.c:3027 ui/evolution-calendar.xml.h:16
+#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 msgid "New Appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3029 calendar/gui/e-week-view.c:3237
+#: 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:3034 calendar/gui/e-week-view.c:3242
+#: 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:3036 calendar/gui/e-week-view.c:3244
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
 msgid "Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3250
-#: mail/folder-browser.c:546 ui/evolution-calendar.xml.h:19
+#: 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 "�bn"
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3252
+#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
 msgid "Delete this Appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3047 calendar/gui/e-week-view.c:3254
+#: 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:3056 calendar/gui/e-week-view.c:3267
+#: 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:3058 calendar/gui/e-week-view.c:3269
+#: 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:3060
+#: calendar/gui/e-day-view.c:3179
 msgid "Delete all Occurrences"
 msgstr ""
 
@@ -2394,7 +2490,7 @@ msgstr "--til--"
 msgid "Calendar Message"
 msgstr "Kalenderbesked"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:613
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
 msgid "Date:"
 msgstr "Dato:"
 
@@ -2498,8 +2594,8 @@ msgstr ""
 "Afs�t\n"
 "tid"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:30
-#: mail/message-list.c:1017
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
+#: mail/message-list.c:1052
 msgid "Status"
 msgstr "Status"
 
@@ -2525,15 +2621,15 @@ msgstr "Metoden der kr�ves for at indl�se '%s' er ikke underst�ttet"
 #. 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
+#: calendar/gui/e-week-view-main-item.c:342
 msgid "%d %B"
 msgstr "%d %b"
 
-#: calendar/gui/e-week-view.c:3235 calendar/gui/e-week-view.c:3258
+#: 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:3271
+#: calendar/gui/e-week-view.c:3314
 msgid "Delete All Occurrences"
 msgstr "Slet alle opf�ringer"
 
@@ -2570,7 +2666,7 @@ msgid "No recurrence"
 msgstr "Ingen genindtr�ffelse"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1577
+#: calendar/gui/event-editor.c:1579
 msgid "Play a sound"
 msgstr "Afspil lyd/sang"
 
@@ -2591,12 +2687,12 @@ msgid "Reminder"
 msgstr "P�mindelse"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1586
+#: calendar/gui/event-editor.c:1588
 msgid "Run a program"
 msgstr "K�_r program"
 
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1583
+#: calendar/gui/event-editor.c:1585
 msgid "Send an email"
 msgstr "Send besked"
 
@@ -2605,7 +2701,7 @@ msgid "Settings..."
 msgstr "Indstillinger..."
 
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1580
+#: calendar/gui/event-editor.c:1582
 msgid "Show a dialog"
 msgstr "Vis dialog"
 
@@ -2625,11 +2721,11 @@ msgstr "_Start-tid:"
 msgid "_Starting date:"
 msgstr "_Start dato:"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
 msgid "after"
 msgstr "efter"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
 msgid "before"
 msgstr "f�r"
 
@@ -2653,129 +2749,121 @@ msgstr "for evigt"
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "etiket21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:42 mail/mail-config.glade.h:77
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
 msgid "minute(s)"
 msgstr "minut(ter)"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "month(s)"
 msgstr "m�ned(er)"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "start of appointment"
 msgstr "start p� aftale"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "until"
 msgstr "til"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "week(s)"
 msgstr "uge(r)"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "year(s)"
 msgstr "�r"
 
-#: calendar/gui/event-editor.c:371
+#: calendar/gui/event-editor.c:373
 msgid "Edit Appointment"
 msgstr "Redig�r aftale"
 
-#: calendar/gui/event-editor.c:449
+#: calendar/gui/event-editor.c:451
 msgid "on"
 msgstr "p�"
 
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:81
+#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/event-editor.c:601
+#: calendar/gui/event-editor.c:603
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/event-editor.c:608
+#: calendar/gui/event-editor.c:610
 msgid "th"
 msgstr "."
 
-#: calendar/gui/event-editor.c:754
+#: calendar/gui/event-editor.c:756
 msgid "occurrences"
 msgstr "h�ndelser"
 
-#: calendar/gui/event-editor.c:871
+#: calendar/gui/event-editor.c:873
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Denne aftale indeholder gentagelser som Evolution ikke kan redigere."
 
-#: calendar/gui/event-editor.c:1532
+#: calendar/gui/event-editor.c:1534
 #, c-format
 msgid " %d days"
 msgstr " %d dage"
 
-#: calendar/gui/event-editor.c:1534
+#: calendar/gui/event-editor.c:1536
 msgid " 1 day"
 msgstr " 1 dag"
 
-#: calendar/gui/event-editor.c:1537
+#: calendar/gui/event-editor.c:1539
 #, c-format
 msgid " %d weeks"
 msgstr " %d uger"
 
-#: calendar/gui/event-editor.c:1539
+#: calendar/gui/event-editor.c:1541
 msgid " 1 week"
 msgstr " 1 uge"
 
-#: calendar/gui/event-editor.c:1542
+#: calendar/gui/event-editor.c:1544
 #, c-format
 msgid " %d hours"
 msgstr " %d timer"
 
-#: calendar/gui/event-editor.c:1544
+#: calendar/gui/event-editor.c:1546
 msgid " 1 hour"
 msgstr " 1 time"
 
-#: calendar/gui/event-editor.c:1547
+#: calendar/gui/event-editor.c:1549
 #, c-format
 msgid " %d minutes"
 msgstr " %d minutter"
 
-#: calendar/gui/event-editor.c:1549
+#: calendar/gui/event-editor.c:1551
 msgid " 1 minute"
 msgstr " 1 minut"
 
-#: calendar/gui/event-editor.c:1552
+#: calendar/gui/event-editor.c:1554
 #, c-format
 msgid " %d seconds"
 msgstr " %d sekunder"
 
-#: calendar/gui/event-editor.c:1554
+#: calendar/gui/event-editor.c:1556
 msgid " 1 second"
 msgstr " 1 sekund"
 
-#: calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1603
 msgid " before start of appointment"
 msgstr " f�r begyndelse p� aftale"
 
-#: calendar/gui/event-editor.c:1603
+#: calendar/gui/event-editor.c:1605
 msgid " after start of appointment"
 msgstr " efter begyndelse p� aftale"
 
-#: calendar/gui/event-editor.c:1611
+#: calendar/gui/event-editor.c:1613
 msgid " before end of appointment"
 msgstr " f�r slutning p� aftale"
 
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/event-editor.c:1615
 msgid " after end of appointment"
 msgstr " efter slutning p� aftale"
 
-#: calendar/gui/event-editor.c:3121 calendar/gui/print.c:1093
-#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
+#: 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 %b %Y"
 
@@ -2811,12 +2899,12 @@ msgstr "Fabrik for kalenderens iTip visningskontrol"
 msgid "Factory for the sample Calendar control"
 msgstr "Fabrik for eksempelkontrol for kalender"
 
-#: calendar/gui/gnome-cal.c:695
+#: calendar/gui/gnome-cal.c:700
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke �bne mappen i `%s'"
 
-#: calendar/gui/gnome-cal.c:706
+#: calendar/gui/gnome-cal.c:711
 #, 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"
@@ -2877,197 +2965,197 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:306
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Su"
 msgstr "s�n"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Mo"
 msgstr "man"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Tu"
 msgstr "tir"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "We"
 msgstr "ons"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Th"
 msgstr "tor"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Fr"
 msgstr "fre"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Sa"
 msgstr "l�r"
 
-#: calendar/gui/print.c:944
+#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Opgaver"
 
 #. Day
-#: calendar/gui/print.c:1074
+#: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
 msgstr "I dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1089
+#: calendar/gui/print.c:1093
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1104
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Denne uge (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1108
+#: calendar/gui/print.c:1112
 msgid "Current month (%b %Y)"
 msgstr "Denne m�ned (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1115
+#: calendar/gui/print.c:1119
 msgid "Current year (%Y)"
 msgstr "Dette �r (%Y)"
 
-#: calendar/gui/print.c:1152
+#: calendar/gui/print.c:1156
 msgid "Print Calendar"
 msgstr "Udskriv kalender"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1341
+#: 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:30
+#: ui/evolution-mail.xml.h:52
 msgid "Print Preview"
 msgstr "Forh�ndsvisning af udskrift"
 
@@ -3115,6 +3203,31 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
+#: camel/camel-cipher-context.c:169
+#, fuzzy
+msgid "Signing is not supported by this cipher"
+msgstr "Den angivne type er ikke underst�ttet i denne gemning"
+
+#: camel/camel-cipher-context.c:207
+#, fuzzy
+msgid "Clearsigning is not supported by this cipher"
+msgstr "Den angivne type er ikke underst�ttet i denne gemning"
+
+#: camel/camel-cipher-context.c:245
+#, fuzzy
+msgid "Verifying is not supported by this cipher"
+msgstr "Den angivne type er ikke underst�ttet i denne gemning"
+
+#: camel/camel-cipher-context.c:286
+#, fuzzy
+msgid "Encryption is not supported by this cipher"
+msgstr "Den angivne type er ikke underst�ttet i denne gemning"
+
+#: camel/camel-cipher-context.c:326
+#, fuzzy
+msgid "Decryption is not supported by this cipher"
+msgstr "Den angivne type er ikke underst�ttet i denne gemning"
+
 #: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
 msgid "Syncing folders"
 msgstr ""
@@ -3168,35 +3281,35 @@ msgstr ""
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:431 camel/camel-filter-search.c:437
+#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:327
+#: camel/camel-folder-search.c:328
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:337
+#: camel/camel-folder-search.c:338
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:484 camel/camel-folder-search.c:512
+#: 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:558
+#: camel/camel-folder-search.c:559
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:669 camel/camel-folder-search.c:713
+#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ugyldig type i krop-beholder, forventer streng"
 
@@ -3281,6 +3394,58 @@ msgstr "(Ukendt fejl)"
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
+#: camel/camel-pgp-context.c:186
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Indtast venligst din %s adgangskode for %s"
+
+#: camel/camel-pgp-context.c:189
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Indtast venligst din %s adgangskode"
+
+#: camel/camel-pgp-context.c:509
+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
+msgid "No password provided."
+msgstr "Ingen adgangskode oplyst."
+
+#: 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
+#, 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:681
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:871
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:888
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Kunne ikke oprette midlertidig fil: %s"
+
+#: camel/camel-pgp-context.c:1011
+#, fuzzy
+msgid "No plaintext to encrypt."
+msgstr "Klik p� ikonen for at dekryptere."
+
+#: camel/camel-pgp-context.c:1037
+msgid "No recipients specified"
+msgstr "Ingen modtagere specificeret"
+
+#: camel/camel-pgp-context.c:1227
+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."
@@ -3296,37 +3461,37 @@ msgstr "Kunne ikke indl�se %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunne ikke indl�se %s: Ingen initieringskode i modulet."
 
-#: camel/camel-remote-store.c:189
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s server %s"
 msgstr "%s-tjener %s"
 
-#: camel/camel-remote-store.c:193
+#: camel/camel-remote-store.c:190
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s-tjeneste for %s p� %s"
 
-#: camel/camel-remote-store.c:243
+#: camel/camel-remote-store.c:240
 msgid "Connection cancelled"
 msgstr "Forbindelse annulleret"
 
-#: camel/camel-remote-store.c:246
+#: camel/camel-remote-store.c:243
 #: camel/providers/smtp/camel-smtp-transport.c:261
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
 
-#: camel/camel-remote-store.c:247
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(ukendt v�rt)"
 
-#: camel/camel-remote-store.c:328 camel/camel-remote-store.c:390
-#: camel/camel-remote-store.c:461
+#: 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
 msgid "Operation cancelled"
 msgstr "Handling annulleret"
 
-#: camel/camel-remote-store.c:467
+#: camel/camel-remote-store.c:464
 msgid "Server unexpectedly disconnected"
 msgstr "Server frakoblet uventet"
 
@@ -3373,37 +3538,37 @@ msgid ""
 "the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:42
+#: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:44
+#: 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:802
+#: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:811
+#: camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge invalid\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:817
+#: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:839
+#: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:857
+#: camel/camel-sasl-digest-md5.c:865
 msgid "Server response contained incomplete authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:867
+#: camel/camel-sasl-digest-md5.c:875
 msgid "Server response does not match\n"
 msgstr ""
 
@@ -3453,22 +3618,22 @@ msgstr "URL '%s' skal indeholde et vertsnavn"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' skal indeholde en sti"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:554
 #, c-format
 msgid "Resolving: %s"
 msgstr "L�ser: '%s'"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:581
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:606
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:608
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -3501,11 +3666,16 @@ msgstr ""
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
 
+#: camel/camel-vee-folder.c:451
+#, fuzzy, c-format
+msgid "No such message %s in %s"
+msgstr "Ingen s�dan besked: %s"
+
 #: camel/camel-vee-folder.c:545
 #, c-format
 msgid "No such message: %s"
@@ -3548,13 +3718,13 @@ msgstr "Kunne ikke indl�se sammendrag for %s"
 msgid "Scanning IMAP folder"
 msgstr "Skanner IMAP-mapper"
 
-#: camel/providers/imap/camel-imap-folder.c:973
-#: camel/providers/imap/camel-imap-folder.c:1177
+#: camel/providers/imap/camel-imap-folder.c:986
+#: camel/providers/imap/camel-imap-folder.c:1197
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1003
-#: camel/providers/imap/camel-imap-folder.c:1211
+#: camel/providers/imap/camel-imap-folder.c:1016
+#: camel/providers/imap/camel-imap-folder.c:1231
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finde beskedskrop i FETCH-svar."
 
@@ -3566,7 +3736,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:476
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
 msgid "Folders"
 msgstr "Mapper"
 
@@ -3622,7 +3792,6 @@ msgid "You didn't enter a password."
 msgstr "Du indtastede ikke en adgangskode."
 
 #: camel/providers/imap/camel-imap-store.c:518
-#: camel/providers/smtp/camel-smtp-transport.c:411
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3633,17 +3802,17 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:858
+#: 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:872
+#: camel/providers/imap/camel-imap-store.c:879
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke oprette katalog %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1373
+#: camel/providers/imap/camel-imap-store.c:1382
 msgid "You must be working online to complete this operation"
 msgstr ""
 
@@ -3862,75 +4031,75 @@ 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:244
+#: camel/providers/local/camel-mbox-summary.c:248
 msgid "Summarising folder"
 msgstr "Laver sammendrag for mappe"
 
-#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-mbox-summary.c:253
 #, 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:291
+#: camel/providers/local/camel-mbox-summary.c:295
 #, 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:366
+#: camel/providers/local/camel-mbox-summary.c:370
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Kan ikke lave oversigt over folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:497
-#: camel/providers/local/camel-mbox-summary.c:698 mail/mail-ops.c:1380
+#: camel/providers/local/camel-mbox-summary.c:501
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
 msgid "Synchronising folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-mbox-summary.c:506
+#: camel/providers/local/camel-mbox-summary.c:707
 #, 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:519
+#: camel/providers/local/camel-mbox-summary.c:523
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke �bne midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:544
-#: camel/providers/local/camel-mbox-summary.c:552
-#: camel/providers/local/camel-mbox-summary.c:741
-#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-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
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Oversigt og mappe uoverensstemmelse, selv efter synkronisering"
 
-#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-mbox-summary.c:599
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fejl under skriving til midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:616
 #, 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-mbox-summary.c:634
+#: camel/providers/local/camel-mbox-summary.c:803
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:643
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:654
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke �ndre navn p� mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:874
+#: camel/providers/local/camel-mbox-summary.c:878
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukendt fejl: %s"
@@ -4320,6 +4489,17 @@ msgstr ""
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVenligst indtast SMTP-adgangskode for %s@%s"
 
+#: camel/providers/smtp/camel-smtp-transport.c:411
+#, fuzzy, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"Kunne ikke autenticere mod IMAP-tjener.\n"
+"%s\n"
+"\n"
+
 #: camel/providers/smtp/camel-smtp-transport.c:527
 #, c-format
 msgid "SMTP server %s"
@@ -4473,7 +4653,7 @@ msgstr "Vedh�ft bilag..."
 msgid "Attach a file to the message"
 msgstr "Vedh�ft bilag til meddelelsen"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1017
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
 msgid "Attachment"
 msgstr "Bilag"
 
@@ -4497,52 +4677,52 @@ msgstr "MIME-type:"
 msgid "Send as:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:321
 msgid "Click here for the address book"
 msgstr "Klik her for adressebogen"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:709
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
 msgid "From:"
 msgstr "Fra:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:711
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:633
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:713
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:377
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Enter the recipients of the message"
 msgstr "Indtast modtagerne for meddelelsen"
 
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:715
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:381
+#: composer/e-msg-composer-hdrs.c:388
 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:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:392
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4658,8 +4838,8 @@ 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:474
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
@@ -4687,8 +4867,8 @@ 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:470
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2502
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
 msgid "%a %m/%d/%Y"
 msgstr "%a %Y-%m-%d"
 
@@ -4706,8 +4886,8 @@ msgstr ""
 
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1248
-#: widgets/misc/e-dateedit.c:1307 widgets/misc/e-dateedit.c:1486
+#: 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"
 
@@ -4718,8 +4898,8 @@ msgstr ""
 
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1251
-#: widgets/misc/e-dateedit.c:1310 widgets/misc/e-dateedit.c:1489
+#: 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 " "
 
@@ -4998,16 +5178,16 @@ msgstr "nu"
 msgid "<click here to select a date>"
 msgstr "<klik her for at v�lge en mappe>"
 
-#: filter/filter-editor.c:129 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "Filterregler"
 
 #. and now for the action area
-#: filter/filter-filter.c:447
+#: filter/filter-filter.c:453
 msgid "Then"
 msgstr "S�"
 
-#: filter/filter-filter.c:461
+#: filter/filter-filter.c:467
 msgid "Add action"
 msgstr "Tilf�j handling"
 
@@ -5019,7 +5199,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:222 filter/vfolder-rule.c:282
+#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
+#: mail/mail-account-gui.c:682
 msgid "Select Folder"
 msgstr "V�lg mappe"
 
@@ -5040,35 +5221,35 @@ msgstr ""
 "Fejl i regul�rt udtryk '%s':\n"
 "%s"
 
-#: filter/filter-part.c:473
+#: filter/filter-part.c:475
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:618
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Regelnavn: "
 
-#: filter/filter-rule.c:622
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "Uden navn"
 
-#: filter/filter-rule.c:638
+#: filter/filter-rule.c:646
 msgid "If"
 msgstr "Hvis"
 
-#: filter/filter-rule.c:656
+#: filter/filter-rule.c:664
 msgid "Execute actions"
 msgstr "Udf�r handlinger"
 
-#: filter/filter-rule.c:660
+#: filter/filter-rule.c:668
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er m�dt"
 
-#: filter/filter-rule.c:665
+#: filter/filter-rule.c:673
 msgid "if any criteria are met"
 msgstr "hvis et kriterie er m�dt"
 
-#: filter/filter-rule.c:676
+#: filter/filter-rule.c:684
 msgid "Add criterion"
 msgstr "Tilf�j kriterie"
 
@@ -5088,7 +5269,7 @@ msgstr "Indkommende"
 msgid "Outgoing"
 msgstr "Udg�ende"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:129
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Visuelle mapper"
 
@@ -5166,247 +5347,256 @@ msgid "Important"
 msgstr "Vigtig"
 
 #: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "Is Not"
+msgstr "er ikke"
+
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Is"
+msgstr "I"
+
+#: filter/libfilter-i18n.h:18
 msgid "Mailing list"
 msgstr "Diskussionsliste"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
 msgid "Message Body"
 msgstr "Beskedskrop"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:20
 msgid "Message Header"
 msgstr "Beskedshoved"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:21
 msgid "Message was received"
 msgstr "Beskeden blev modtaget"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:22
 msgid "Message was sent"
 msgstr "Beskeden blev sendt"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:23
 msgid "Move to Folder"
 msgstr "Flyt til folder"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:24
 msgid "Read"
 msgstr "L�st"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:25
 msgid "Recipients"
 msgstr "Modtagere"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:26
 msgid "Regex Match"
 msgstr "Passer p� regul�rt udtryk"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:27
 msgid "Replied to"
 msgstr "Svaret til"
 
-#: filter/libfilter-i18n.h:26 filter/score-rule.c:203 filter/score-rule.c:205
-#: mail/message-list.c:1017
+#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
+#: mail/message-list.c:1052
 msgid "Score"
 msgstr "Point"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:29
 msgid "Sender"
 msgstr "Afsender"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:30
 msgid "Set Status"
 msgstr "_S�t Status"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "Source Account"
+msgstr "Konto"
+
+#: filter/libfilter-i18n.h:32
 msgid "Specific header"
 msgstr "Specifik header"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:34
 msgid "Stop Processing"
 msgstr "Stop behandling"
 
-#: filter/libfilter-i18n.h:32 mail/message-list.c:1018
+#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:38
 msgid "contains"
 msgstr "indeholder"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:39
 msgid "does not contain"
 msgstr "indeholder ikke"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:40
 msgid "does not end with"
 msgstr "slutter ikke med"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
 msgid "does not exist"
 msgstr "eksisterer ikke"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42
 msgid "does not sound like"
 msgstr "lyder ikke som"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 msgid "does not start with"
 msgstr "starter ikke med"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:44
 msgid "ends with"
 msgstr "slutter med"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:45
 msgid "exists"
 msgstr "eksisterer"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 msgid "is greater than"
 msgstr "er st�rre end"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 msgid "is less than"
 msgstr "er mindre end"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "is not"
 msgstr "er ikke"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 msgid "is"
 msgstr "er"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "on or after"
 msgstr "p� eller efter"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "on or before"
 msgstr "p� eller f�r"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
 msgid "sounds like"
 msgstr "lyder som"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "starter med"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:54
 msgid "was after"
 msgstr "var efter"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:55
 msgid "was before"
 msgstr "var f�r"
 
-#: filter/score-editor.c:129
+#: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr ""
 
-#: mail/component-factory.c:332
+#: mail/component-factory.c:329
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initialisere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:405
+#: mail/component-factory.c:402
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere gemning i skallen"
 
-#: mail/folder-browser-factory.c:208
+#: mail/folder-browser-factory.c:209
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-factory.c:210 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: mail/folder-browser.c:222
+#: mail/folder-browser.c:225
 msgid "Store search as vFolder"
 msgstr "Gem s�gning som vFolder"
 
-#: mail/folder-browser.c:513
+#: mail/folder-browser.c:533
 msgid "VFolder on Subject"
 msgstr "VMappe for emne"
 
-#: mail/folder-browser.c:516
+#: mail/folder-browser.c:536
 msgid "VFolder on Sender"
 msgstr "VMappe for afsender"
 
-#: mail/folder-browser.c:519
+#: mail/folder-browser.c:539
 msgid "VFolder on Recipients"
 msgstr "VMappe for modtagere"
 
-#: mail/folder-browser.c:522 mail/folder-browser.c:713
+#: mail/folder-browser.c:542 mail/folder-browser.c:733
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:528
+#: mail/folder-browser.c:548
 msgid "Filter on Subject"
 msgstr "Filtr�r efter emne"
 
-#: mail/folder-browser.c:531
+#: mail/folder-browser.c:551
 msgid "Filter on Sender"
 msgstr "Filtr�r efter afsender"
 
-#: mail/folder-browser.c:534
+#: mail/folder-browser.c:554
 msgid "Filter on Recipients"
 msgstr "Filtr�r efter modtager"
 
-#: mail/folder-browser.c:537 mail/folder-browser.c:712
+#: mail/folder-browser.c:557 mail/folder-browser.c:732
 msgid "Filter on Mailing List"
 msgstr "Filtr�r efter epostliste"
 
-#: mail/folder-browser.c:548
+#: mail/folder-browser.c:568
 msgid "Resend"
 msgstr ""
 
-#: mail/folder-browser.c:550
+#: mail/folder-browser.c:570
 msgid "Save As..."
 msgstr "Gem som..."
 
-#: mail/folder-browser.c:552 mail/mail-view.c:154
-#: 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 "Udskriv"
-
-#: mail/folder-browser.c:557
+#: mail/folder-browser.c:577
 msgid "Reply to Sender"
 msgstr "Svar til afsender"
 
-#: mail/folder-browser.c:559 mail/mail-view.c:147 ui/evolution-mail.xml.h:36
+#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/folder-browser.c:561 mail/mail-view.c:150 ui/evolution-mail.xml.h:14
+#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/folder-browser.c:563
+#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
 msgid "Forward inline"
 msgstr "Videresend mellem linjerne"
 
-#: mail/folder-browser.c:566
+#: mail/folder-browser.c:586
 msgid "Mark as Read"
 msgstr "Mark�r som _l�st"
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:588
 msgid "Mark as Unread"
 msgstr "Mark�r som ul�st"
 
-#: mail/folder-browser.c:573
+#: mail/folder-browser.c:593
 msgid "Move to Folder..."
 msgstr "Flyt til mappe..."
 
-#: mail/folder-browser.c:575
+#: mail/folder-browser.c:595
 msgid "Copy to Folder..."
 msgstr "Kopi�r til mappe..."
 
-#: mail/folder-browser.c:579
+#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
 msgid "Undelete"
 msgstr "Fortryd sletning"
 
@@ -5414,20 +5604,20 @@ msgstr "Fortryd sletning"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:589
+#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
 msgid "Apply Filters"
 msgstr "Anvend filtre"
 
-#: mail/folder-browser.c:593
+#: mail/folder-browser.c:613
 msgid "Create Rule From Message"
 msgstr "Skab regel fra besked"
 
-#: mail/folder-browser.c:715
+#: mail/folder-browser.c:735
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtr�r efter epostliste (%s)"
 
-#: mail/folder-browser.c:716
+#: mail/folder-browser.c:736
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
@@ -5654,7 +5844,7 @@ msgstr "Gem besked som..."
 msgid "Save Messages As..."
 msgstr "Gem beskeder som..."
 
-#: mail/mail-callbacks.c:1252
+#: mail/mail-callbacks.c:1253
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5663,15 +5853,15 @@ msgstr ""
 "Fejl ved indl�sning af filter information:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1301
+#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/mail-callbacks.c:1348
+#: mail/mail-callbacks.c:1349
 msgid "Printing of message failed"
 msgstr "Udskrivning af besked mislykkedes"
 
-#: mail/mail-config.c:1016 mail/mail-config.c:1019
+#: mail/mail-config.c:1043 mail/mail-config.c:1046
 msgid "Connecting to server..."
 msgstr "Opkobler til server..."
 
@@ -5932,111 +6122,112 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:444
+#: mail/mail-config-druid.c:445
 msgid "Evolution Account Wizard"
 msgstr "Evolution konto-guide"
 
-#: mail/mail-display.c:196
+#: mail/mail-display.c:194
 msgid "Save Attachment"
 msgstr "Gem bilag"
 
-#: mail/mail-display.c:236
+#: mail/mail-display.c:234
 #, 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:295
 msgid "Save to Disk..."
 msgstr "Gem p� disk..."
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:297
 #, c-format
 msgid "Open in %s..."
 msgstr "�bn i %s..."
 
-#: mail/mail-display.c:301
+#: mail/mail-display.c:299
 msgid "View Inline"
 msgstr "Vis i brev"
 
-#: mail/mail-display.c:336
+#: mail/mail-display.c:334
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:359
+#: mail/mail-display.c:357
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis i brev (via %s)"
 
-#: mail/mail-display.c:363
+#: mail/mail-display.c:361
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:1083
-msgid "Open link in browser (FIXME)"
-msgstr ""
+#: mail/mail-display.c:1102
+#, fuzzy
+msgid "Open link in browser"
+msgstr "_�bn i nyt vindue"
 
-#: mail/mail-display.c:1085
+#: mail/mail-display.c:1104
 msgid "Save as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1087
+#: mail/mail-display.c:1106
 msgid "Copy location (FIXME)"
 msgstr ""
 
-#: mail/mail-format.c:512
+#: mail/mail-format.c:518
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilag"
 
-#: mail/mail-format.c:554
+#: mail/mail-format.c:560
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:736
+#: mail/mail-format.c:742
 msgid "Loading message content"
 msgstr "Indl�ser indholdet af beskeden"
 
-#: mail/mail-format.c:1025
+#: mail/mail-format.c:1046
 msgid "Encrypted message not displayed"
 msgstr "Krypteret besked ikke vist"
 
-#: mail/mail-format.c:1031
+#: mail/mail-format.c:1052
 msgid "Encrypted message"
 msgstr "Krypteret besked"
 
-#: mail/mail-format.c:1032
+#: mail/mail-format.c:1053
 msgid "Click icon to decrypt."
 msgstr "Klik p� ikonen for at dekryptere."
 
-#: mail/mail-format.c:1101 mail/mail-format.c:1488
+#: mail/mail-format.c:1137 mail/mail-format.c:1526
 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:1109 mail/mail-format.c:1496
+#: mail/mail-format.c:1145 mail/mail-format.c:1534
 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:1709
+#: mail/mail-format.c:1747
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peger til FTP-tjener (%s)"
 
-#: mail/mail-format.c:1721
+#: mail/mail-format.c:1759
 #, 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:1725
+#: mail/mail-format.c:1763
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peger til lokal fil (%s)"
 
-#: mail/mail-format.c:1759
+#: mail/mail-format.c:1797
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peger til ukendt eksternt data (\"%s\"-type)"
 
-#: mail/mail-format.c:1764
+#: mail/mail-format.c:1802
 msgid "Malformed external-body part."
 msgstr "Fejludformet del for ekstern-krop."
 
@@ -6128,93 +6319,93 @@ msgstr "Accepterer du?"
 msgid "Evolution progress"
 msgstr "Evolution fremgang"
 
-#: mail/mail-ops.c:588
+#: mail/mail-ops.c:587
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender '%s'"
 
-#: mail/mail-ops.c:590
+#: mail/mail-ops.c:589
 msgid "Sending message"
 msgstr "Sender meddelelse"
 
-#: mail/mail-ops.c:705
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:724
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:726 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
 msgid "Complete."
 msgstr "Fuldf�rt."
 
-#: mail/mail-ops.c:812
+#: mail/mail-ops.c:811
 msgid "Saving message to folder"
 msgstr "Gemmer besked i mappe"
 
-#: mail/mail-ops.c:885
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter meddelelser til %s"
 
-#: mail/mail-ops.c:885
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer beskeder til %s"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:900
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:903
 msgid "Copying"
 msgstr "Kopi�rer"
 
-#: mail/mail-ops.c:979
+#: mail/mail-ops.c:978
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i '%s'"
 
-#: mail/mail-ops.c:1137
+#: mail/mail-ops.c:1139
 msgid "Forwarded messages"
 msgstr "Videresendte meddelelser"
 
-#: mail/mail-ops.c:1178 mail/mail-ops.c:1316
+#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
 #, c-format
 msgid "Opening folder %s"
 msgstr "�bner mappe %s"
 
-#: mail/mail-ops.c:1245
+#: mail/mail-ops.c:1247
 #, c-format
 msgid "Opening store %s"
 msgstr "�bner lager %s"
 
-#: mail/mail-ops.c:1432
+#: mail/mail-ops.c:1434
 msgid "Expunging folder"
 msgstr "T�mmer mappe for slettede beskeder"
 
-#: mail/mail-ops.c:1481
+#: mail/mail-ops.c:1483
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Modtager meddelelse %s"
 
-#: mail/mail-ops.c:1548
+#: mail/mail-ops.c:1550
 msgid "Retrieving messages"
 msgstr "Modtager meddelelser"
 
-#: mail/mail-ops.c:1558
+#: mail/mail-ops.c:1560
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Henter besked nummer %d af %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1632
+#: mail/mail-ops.c:1634
 msgid "Saving messages"
 msgstr "Gemmer beskeder"
 
-#: mail/mail-ops.c:1711
+#: mail/mail-ops.c:1713
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6223,12 +6414,12 @@ msgstr ""
 "Kunne ikke oprette uddatafil:  %s\n"
 " %s"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1726
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Gemmer besked %d af %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1738
+#: mail/mail-ops.c:1740
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6237,11 +6428,11 @@ msgstr ""
 "Fejl ved gemning af beskeder til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1812
+#: mail/mail-ops.c:1814
 msgid "Saving attachment"
 msgstr "Gemmer bilag"
 
-#: mail/mail-ops.c:1827
+#: mail/mail-ops.c:1829
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6250,7 +6441,7 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1855
+#: mail/mail-ops.c:1857
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
@@ -6333,150 +6524,115 @@ msgstr "Ny VMappe"
 
 #. 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:35
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:39
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
 msgid "Reply to the sender of this message"
 msgstr "Svar til afsenderen af denne meddelelse"
 
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
 msgid "Reply to all recipients of this message"
 msgstr "Svar til alle modtagere af denne meddelelse"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:16
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
 msgid "Forward this message"
 msgstr "Videresend denne meddelelse"
 
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:32
+#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
 msgid "Print the selected message"
 msgstr "Udskriv den valgte meddelelse"
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:7
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Slet denne meddelelse"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:648
 msgid "Unseen"
 msgstr "Ul�st"
 
-#: mail/message-list.c:618
+#: mail/message-list.c:649
 msgid "Seen"
 msgstr "L�st"
 
-#: mail/message-list.c:619
+#: mail/message-list.c:650
 msgid "Answered"
 msgstr "Besvaret"
 
-#: mail/message-list.c:620
+#: mail/message-list.c:651
 msgid "Multiple Unseen Messages"
 msgstr "Flere ul�ste beskeder"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:652
 msgid "Multiple Messages"
 msgstr "Flere beskeder"
 
-#: mail/message-list.c:625
+#: mail/message-list.c:656
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:657
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:630
+#: mail/message-list.c:661
 msgid "Higher"
 msgstr "H�jere"
 
-#: mail/message-list.c:631
+#: mail/message-list.c:662
 msgid "Highest"
 msgstr "H�jest"
 
-#: mail/message-list.c:881
+#: mail/message-list.c:912
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:888
+#: mail/message-list.c:919
 msgid "Today %l:%M %p"
 msgstr "Idag %h:%M"
 
-#: mail/message-list.c:897
+#: mail/message-list.c:928
 msgid "Yesterday %l:%M %p"
 msgstr "Ig�r %h:%M"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:940
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:917
+#: mail/message-list.c:948
 msgid "%b %d %l:%M %p"
 msgstr "%a %Y-%m-%d %H:%M:%S"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:950
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:1017
+#: mail/message-list.c:1052
 msgid "Flagged"
 msgstr "M�rket"
 
-#: mail/message-list.c:1018
+#: mail/message-list.c:1053
 msgid "From"
 msgstr "Afsender"
 
-#: mail/message-list.c:1018
+#: mail/message-list.c:1053
 msgid "Date"
 msgstr "Dato"
 
-#: mail/message-list.c:1018
+#: mail/message-list.c:1053
 msgid "Received"
 msgstr "Modtaget"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1054
 msgid "To"
 msgstr "Modtager"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1054
 msgid "Size"
 msgstr "St�rrelse"
 
-#: mail/openpgp-utils.c:92
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Indtast venligst din %s adgangskode for %s"
-
-#: mail/openpgp-utils.c:95
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Indtast venligst din %s adgangskode"
-
-#: mail/openpgp-utils.c:455 mail/openpgp-utils.c:561 mail/openpgp-utils.c:763
-#: mail/openpgp-utils.c:916 mail/openpgp-utils.c:1074
-msgid "No GPG/PGP program available."
-msgstr "GPG/PGP-program ikke tilg�ngelig."
-
-#: mail/openpgp-utils.c:462 mail/openpgp-utils.c:570 mail/openpgp-utils.c:770
-#: mail/openpgp-utils.c:923
-msgid "No password provided."
-msgstr "Ingen adgangskode oplyst."
-
-#: mail/openpgp-utils.c:470 mail/openpgp-utils.c:577 mail/openpgp-utils.c:776
-#: mail/openpgp-utils.c:931 mail/openpgp-utils.c:1080
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Kunne ikke oprette r�r til GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:591
-msgid "No recipients specified"
-msgstr "Ingen modtagere specificeret"
-
-#: mail/openpgp-utils.c:1091
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Kunne ikke oprette midlertidig fil: %s"
-
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:43
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
 msgid "Folder"
 msgstr "Mappe"
 
@@ -6520,9 +6676,23 @@ msgstr "Mappetype:"
 msgid "Specify where to create the folder:"
 msgstr "Angiv hvor mappen skal oprettes:"
 
+#: 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 ""
+"V�lg filen du �nsker at importere til Evolution og v�lg hvilken type fil det "
+"er fra listen.\n"
+"\n"
+"Du kan v�lge \"Automatisk\" hvis du ikke ved det, s� vil Evolution pr�ve at "
+"finde ud af hvilken type det er, for dig."
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/importer/importer.c:175
+#: shell/importer/importer.c:182
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6533,7 +6703,7 @@ msgstr ""
 "Import�r ikke klar.\n"
 "Venter 5 sekunder f�r nyt fors�g."
 
-#: shell/importer/importer.c:195 shell/importer/importer.c:226
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6542,7 +6712,7 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opf�ring %d."
 
-#: shell/importer/importer.c:334
+#: shell/importer/importer.c:341
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -6551,11 +6721,11 @@ msgstr ""
 "Der er ingen import�r som kan h�ndtere\n"
 "%s"
 
-#: shell/importer/importer.c:344
+#: shell/importer/importer.c:351
 msgid "Importing"
 msgstr "Importerer"
 
-#: shell/importer/importer.c:352
+#: shell/importer/importer.c:359
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -6564,17 +6734,17 @@ msgstr ""
 "Importerer %s.\n"
 "Starter %s"
 
-#: shell/importer/importer.c:365
+#: shell/importer/importer.c:372
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/importer/importer.c:380
+#: shell/importer/importer.c:387
 #, c-format
 msgid "Error loading %s"
 msgstr "Fejl under indl�sning af %s"
 
-#: shell/importer/importer.c:395
+#: shell/importer/importer.c:402
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6583,40 +6753,26 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opf�ring 1."
 
-#: shell/importer/importer.c:466
+#: shell/importer/importer.c:473
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/importer/importer.c:516
+#: shell/importer/importer.c:523
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:521
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
 msgid "Select a file"
 msgstr "V�lg fil"
 
-#: shell/importer/importer.c:531
+#: shell/importer/importer.c:538
 msgid "File type:"
 msgstr "Filtype:"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:612
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
 msgid "Import"
 msgstr "Import�r"
 
-#: shell/importer/importer.c:647
-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 ""
-"V�lg filen du �nsker at importere til Evolution og v�lg hvilken type fil det "
-"er fra listen.\n"
-"\n"
-"Du kan v�lge \"Automatisk\" hvis du ikke ved det, s� vil Evolution pr�ve at "
-"finde ud af hvilken type det er, for dig."
-
 #: shell/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."
@@ -6639,11 +6795,11 @@ msgstr ""
 "Via denne vejviser vil du ledes gennem importprocessen af\n"
 "eksterne filer til Evolution."
 
-#: shell/e-setup.c:116 shell/e-setup.c:189
+#: shell/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr "Evolution installation"
 
-#: shell/e-setup.c:120
+#: shell/e-setup.c:122
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6651,29 +6807,29 @@ msgstr ""
 "Denne nye version af Evolution skal installere flere filer i\n"
 "dit personlige Evolution-katalog"
 
-#: shell/e-setup.c:121
+#: shell/e-setup.c:123
 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:161
+#: shell/e-setup.c:163
 msgid "Could not update files correctly"
 msgstr "Kunne ikke opdatere filer korrekt"
 
-#: shell/e-setup.c:164 shell/e-setup.c:232
+#: shell/e-setup.c:166 shell/e-setup.c:234
 msgid "Evolution files successfully installed."
 msgstr "Evolutions filer blev installeret."
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:195
 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:194
+#: shell/e-setup.c:196
 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:213
+#: shell/e-setup.c:215
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6684,7 +6840,7 @@ msgstr ""
 "%s\n"
 "Fejl: %s"
 
-#: shell/e-setup.c:228
+#: shell/e-setup.c:230
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -6693,7 +6849,7 @@ msgstr ""
 "Kan ikke kopiere filer til\n"
 "'%s'."
 
-#: shell/e-setup.c:253
+#: shell/e-setup.c:255
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6704,7 +6860,7 @@ msgstr ""
 "Venligst fjern denne for at tillade installation\n"
 "af Evolution's brugerfiler."
 
-#: shell/e-setup.c:265
+#: shell/e-setup.c:267
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6774,16 +6930,16 @@ msgstr ""
 msgid "Go to folder..."
 msgstr "G� til mappe..."
 
-#: shell/e-shell-view.c:145
+#: shell/e-shell-view.c:148
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:1126
+#: shell/e-shell-view.c:1134
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1128
+#: shell/e-shell-view.c:1136
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
@@ -6802,15 +6958,15 @@ msgstr ""
 "Ups! Visningen for `%s' d�de uventet. :-(\n"
 "Dette betyder sandsynligvis at %s komponenten er brudt ned."
 
-#: shell/e-shortcuts-view.c:121
+#: shell/e-shortcuts-view.c:134
 msgid "Create new shortcut group"
 msgstr "Opret en ny kontakt"
 
-#: shell/e-shortcuts-view.c:124
+#: shell/e-shortcuts-view.c:137
 msgid "Group name:"
 msgstr "Gruppenavn:"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:260
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -6819,73 +6975,73 @@ msgstr ""
 "�nsker du virkelig at fjerne gruppe %s\n"
 "fra genvejsbj�lken?"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:265
 msgid "Don't remove"
 msgstr "Fjern ikke"
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:276
 msgid "_Small Icons"
 msgstr "_Sm� ikoner"
 
-#: shell/e-shortcuts-view.c:264
+#: shell/e-shortcuts-view.c:277
 msgid "Show the shortcuts as small icons"
 msgstr "Vis genveje som sm� ikoner"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:279
 msgid "_Large Icons"
 msgstr "Store i_koner"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:280
 msgid "Show the shortcuts as large icons"
 msgstr "Vis genveje som store ikoner"
 
-#: shell/e-shortcuts-view.c:278
+#: shell/e-shortcuts-view.c:291
 msgid "_New Group..."
 msgstr "_Ny gruppe..."
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:292
 msgid "Create a new shortcut group"
 msgstr "Opret en ny genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:294
 msgid "_Remove This Group..."
 msgstr "_Fjern denne gruppe..."
 
-#: shell/e-shortcuts-view.c:282
+#: shell/e-shortcuts-view.c:295
 msgid "Remove this shortcut group"
 msgstr "Fjern denne genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:287
+#: shell/e-shortcuts-view.c:300
 msgid "_Hide the Shortcut Bar"
 msgstr "Skjul genvejsbj�lken"
 
-#: shell/e-shortcuts-view.c:288
+#: shell/e-shortcuts-view.c:301
 msgid "Hide the shortcut bar"
 msgstr "Skjul genvejsbj�lken"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:385
 msgid "Activate"
 msgstr "Aktiv�r"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:385
 msgid "Activate this shortcut"
 msgstr "Aktiv�r denne genvej"
 
-#: shell/e-shortcuts-view.c:375
+#: shell/e-shortcuts-view.c:388
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne genvej fra genvejsbj�lken"
 
-#: shell/e-shortcuts.c:375
+#: shell/e-shortcuts.c:379
 msgid "Error saving shortcuts."
 msgstr "Fejl under gemning af genveje."
 
-#: shell/e-storage-set-view.c:646 ui/evolution-event-editor.xml.h:76
+#: 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 "_Vis"
 
-#: shell/e-storage-set-view.c:646
+#: shell/e-storage-set-view.c:649
 msgid "View the selected folder"
 msgstr "Vis den valgte mappe"
 
@@ -7025,7 +7181,7 @@ msgstr "Find kontakt"
 msgid "New contact"
 msgstr "Ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:28
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
 msgid "Previews the message to be printed"
 msgstr "Viser forh�ndsvisning af beskeden som skal udskrives"
 
@@ -7033,7 +7189,7 @@ msgstr "Viser forh�ndsvisning af beskeden som skal udskrives"
 msgid "Print contacts"
 msgstr "Udskriv kontakt"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:48
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
 msgid "Stop"
 msgstr "Stop"
 
@@ -7067,7 +7223,7 @@ 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-mail.xml.h:78
+#: 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"
 msgstr "_V�rkt�j"
@@ -7181,8 +7337,8 @@ msgstr "Vis �n uge"
 msgid "Show the working week"
 msgstr "Vis arbejdsugen"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:223
-#: widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
+#: widgets/misc/e-dateedit.c:422
 msgid "Today"
 msgstr "I dag"
 
@@ -7215,7 +7371,7 @@ msgstr "_Ny"
 msgid "_Open Calendar"
 msgstr "_�bn kalender"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:75
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
 #: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "_Gem som..."
@@ -7246,7 +7402,7 @@ msgid "Print this item"
 msgstr "Udskriv denne ting"
 
 #: 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
+#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Udskriv..."
 
@@ -7333,7 +7489,7 @@ msgstr "Luk denne aftale"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "Kopi�r til mappe... (RET)"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Kopi�r"
@@ -7444,7 +7600,8 @@ msgstr "_Planl�g m�de"
 msgid "Schedule some sort of a meeting"
 msgstr "Ops�t et eller andet m�de"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+#: 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 "V�lg alle"
 
@@ -7522,7 +7679,7 @@ msgstr "_Inds�t"
 msgid "_Print"
 msgstr "_Udskriv"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:71
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "Egenska_ber..."
@@ -7560,2545 +7717,299 @@ msgstr "Indstillinger for Ledelsesresum�..."
 msgid "New Mail"
 msgstr "Nyt post"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-mail.xml.h:2
+msgid "Apply any new filters to the mail in this box"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:3
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:4
 msgid "Compose"
 msgstr "Skriv"
 
-#: ui/evolution-mail.xml.h:2
+#: ui/evolution-mail.xml.h:5
 msgid "Compose a new message"
 msgstr "Udskriv ny meddelelse"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Configure Folder..."
+msgstr "_Konfigur�r folder..."
+
+#: ui/evolution-mail.xml.h:8
 msgid "Copy message to a new folder"
 msgstr "Kopi�r meddelelse til en ny mappe"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail.xml.h:9
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Kopi�r meddelelse til en ny mappe"
+
+#: ui/evolution-mail.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Opret _virtuel mappe fra besked"
 
-#: ui/evolution-mail.xml.h:8
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Delete the selected messages"
+msgstr "Udskriv den valgte meddelelse"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Display all of the message headers"
 msgstr "Vis komplette beskedshoveder"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:15
+#, fuzzy
+msgid "Edit Message"
+msgstr "Udskriv besked"
+
+#: ui/evolution-mail.xml.h:16
+#, fuzzy
+msgid "Edit the current message"
+msgstr "den aktuelle tid"
+
+#: ui/evolution-mail.xml.h:17
 msgid "Empty _Trash"
 msgstr "_T�m papirkurven"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Expunge"
+msgstr "_T�m skr�ldespand"
+
+#: ui/evolution-mail.xml.h:19
 msgid "Filter on Se_nder"
 msgstr "Filtr�r efter se_nder"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:20
 msgid "Filter on _Recipients"
 msgstr "Filtr�r p� modtage_re"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:21
 msgid "Filter on _Subject"
 msgstr "Filtr�r p� e_mne"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:22
+msgid "Finaly remove all mails tagged for deletion"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:23
 msgid "Forget _Passwords"
 msgstr "Glem _adgangskoder"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:25
 msgid "Forward As"
 msgstr "Videresend som"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail.xml.h:27
+msgid "Forward the selected mail to someone"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:29
+#, fuzzy
+msgid "Forward this message in-line with your mail, so you can edit it"
+msgstr "Videresend en meddelelse uden et emne"
+
+#: ui/evolution-mail.xml.h:30
 msgid "Full _Headers"
 msgstr "Fulde _headere"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:31
 msgid "Hide Deleted Messages"
 msgstr "Skjul slettede beskeder"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:32
 msgid "Hide S_elected Messages"
 msgstr "Skjul valgte beskeder"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:33
 msgid "Hide _Deleted Messages"
 msgstr "Skjul slettede beskeder"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:34
 msgid "Hide _Read messages"
 msgstr "Skjul _l�ste beskeder"
 
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:35
+#, fuzzy
+msgid "Invert Selection"
+msgstr "Re_vers�r udvalg"
+
+#: ui/evolution-mail.xml.h:36
 msgid "Manage _Subscriptions..."
 msgstr "_H�ndt�r abonnement..."
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:37
 msgid "Mar_k as Read"
 msgstr "M�r_k som l�st"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:38
 msgid "Mark All as R_ead"
 msgstr "M�rk alle som l_�st"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:39
+#, fuzzy
+msgid "Mark As Read"
+msgstr "M�rk som _l�st"
+
+#: ui/evolution-mail.xml.h:40
+msgid "Mark As U_nread"
+msgstr "M�rk som _ul�st"
+
+#: ui/evolution-mail.xml.h:41
 msgid "Mark as U_nread"
 msgstr "M�rk som u_l�st"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:42
+#, fuzzy
+msgid "Mark the selected messages as having been read"
+msgstr "Udskriv den valgte meddelelse"
+
+#: ui/evolution-mail.xml.h:43
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:44
 msgid "Move"
 msgstr "Flyt"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:45
 msgid "Move message to a new folder"
 msgstr "Flyt meddelelsen til en ny mappe"
 
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:46
+#, fuzzy
+msgid "Move selected messages to another folder"
+msgstr "Flyt meddelelsen til en ny mappe"
+
+#: ui/evolution-mail.xml.h:47
+#, fuzzy
+msgid "Open in New Window"
+msgstr "_�bn i nyt vindue"
+
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Open the current message in a new window"
+msgstr "Send meddelelsen nu"
+
+#: ui/evolution-mail.xml.h:53
+msgid "Print Preview of message..."
+msgstr "Vis udskrift af besked..."
+
+#: ui/evolution-mail.xml.h:54
 msgid "Print message to the printer"
 msgstr "Udskriv besked til printeren"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:55
+msgid "Print message..."
+msgstr "Udskriv besked..."
+
+#: ui/evolution-mail.xml.h:58
 msgid "Redirect (FIXME: implement me)"
 msgstr "Omdirig�r"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:61
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:62
+#, fuzzy
+msgid "Reply to all"
+msgstr "Svar til alle"
+
+#: ui/evolution-mail.xml.h:64
+#, fuzzy
+msgid "Reply to sender"
+msgstr "Svar til afsender"
+
+#: ui/evolution-mail.xml.h:66
 msgid "S_ource"
 msgstr "Kilde"
 
-#: ui/evolution-mail.xml.h:41 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "Save the message into a new file"
+msgstr "Gem meddelelsen i en angivet mappe"
+
+#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "V�lg _alle"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:70
 msgid "Select _Thread"
 msgstr "V�lg _tr�d"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:71
 msgid "Send / Receive"
 msgstr "Send og modtag"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:72
+msgid "Send a reply to the person who sent you this mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:73
+msgid "Send a single mail in reply to all the selected mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:74
 msgid ""
 "Send queued mail\n"
 "    and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:76
 msgid "Send queued mail and retrieve new mail"
 msgstr "Afsend k�et post og modtag ny post"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:77
 msgid "Show _All"
 msgstr "Vis _alt"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:79
 msgid "Threaded Message list"
 msgstr "Tr�det meddelelsesliste"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:80
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "Udskriv den valgte meddelelse"
+
+#: ui/evolution-mail.xml.h:82
 msgid "VFolder on Se_nder"
 msgstr "VMappe for _afsender"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:83
 msgid "VFolder on _Recipients"
 msgstr "VMappe for _modtagere"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:84
 msgid "VFolder on _Subject"
 msgstr "VFolder p� e_mne"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:85
 msgid "View Raw Message Source"
 msgstr "Vis r� beskedskildetekst"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:86
 msgid "Virtual Folder _Editor..."
 msgstr "R_edigering af virtuelle mapper..."
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:87
 msgid "_Apply Filters"
 msgstr "_Anvend filtre"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:88
 msgid "_Attachment"
 msgstr "_Bilag"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Compose"
-msgstr "_Skriv"
-
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:89
 msgid "_Copy to Folder..."
 msgstr "_Kopi�r til mappe..."
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:90
 msgid "_Create Filter From Message"
 msgstr "_Opret filter fra besked"
 
-#: ui/evolution-mail.xml.h:61
-msgid "_Expunge"
-msgstr "_T�m skr�ldespand"
-
-#: ui/evolution-mail.xml.h:62
-msgid "_Filters..."
-msgstr "_Filtre..."
-
-#: ui/evolution-mail.xml.h:63 ui/evolution.xml.h:31
-msgid "_Folder"
-msgstr "_Mapper"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Forward"
-msgstr "_Videresend"
-
-#: ui/evolution-mail.xml.h:65
-msgid "_Inline"
-msgstr "_Inline"
-
-#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Re_vers�r udvalg"
-
-#: ui/evolution-mail.xml.h:67
-msgid "_Mail Message"
-msgstr "Send _besked"
-
-#: ui/evolution-mail.xml.h:68
-msgid "_Mail Settings..."
-msgstr "Indstillinger for e-post..."
-
-#: ui/evolution-mail.xml.h:69
-msgid "_Move to Folder..."
-msgstr "_Flyt til mappe..."
-
-#: ui/evolution-mail.xml.h:70
-msgid "_Open Selected Items"
-msgstr "_�bn valgte opf�ringer"
-
-#: ui/evolution-mail.xml.h:72
-msgid "_Quoted"
-msgstr "_Citeret"
-
-#: ui/evolution-mail.xml.h:73
-msgid "_Reply"
-msgstr "Sva_r"
-
-#: ui/evolution-mail.xml.h:74
-msgid "_Resend Messages"
-msgstr "Send beskede_r igen"
-
-#: ui/evolution-mail.xml.h:76
-msgid "_Send / Receive"
-msgstr "_Send og modtag"
-
-#: ui/evolution-mail.xml.h:77
-msgid "_Threaded"
-msgstr "_Tr�det"
-
-#: ui/evolution-mail.xml.h:79
-msgid "_Undelete"
-msgstr "_Fortryd sletning"
-
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Vedh�ft"
-
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
-msgid "Close the current file"
-msgstr "Luk aktiv fil"
-
-#: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
-msgstr "Krypt�r denne besked med PGP"
-
-#: ui/evolution-message-composer.xml.h:6
-msgid "F_ormat"
-msgstr "F_ormat"
-
-#: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
-msgstr "HTML"
-
-#: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
-msgstr "Inds�t en fil som tekst i meddelelsen"
-
-#: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
-msgstr "Inds�t tekstfil..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "�bn en fil"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "PGP-kryptering"
-
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "PGP-underskrift"
-
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Gem _kladde"
-
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Gem i _mappe..."
-
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save in folder..."
-msgstr "Gem i mappe..."
-
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the current file with a different name"
-msgstr "Gem den aktive fil med et andet navn"
-
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save the message in a specified folder"
-msgstr "Gem meddelelsen i en angivet mappe"
-
-#: ui/evolution-message-composer.xml.h:23
-msgid "Send"
-msgstr "Send"
-
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send _Later"
-msgstr "Send _senere"
-
-#: ui/evolution-message-composer.xml.h:25
-msgid "Send _later"
-msgstr "Send se_nere"
-
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send the mail in HTML format"
-msgstr "Send meddelser i HTML-format"
-
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send the message later"
-msgstr "Send beskeden senere"
-
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Send meddelelsen nu"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send this message now"
-msgstr "Send denne meddelelse nu"
-
-#: ui/evolution-message-composer.xml.h:30
-msgid "Show / hide attachments"
-msgstr "Vis/skjul bilag"
-
-#: ui/evolution-message-composer.xml.h:31
-msgid "Show _attachments"
-msgstr "Vis _bilag"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Show attachments"
-msgstr "Vis bilag"
-
-#: ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
-msgstr "Underskriver denne besked med din PGP-n�gle"
-
-#: ui/evolution-message-composer.xml.h:34
-msgid "Toggles whether the BCC field is displayed"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:35
-msgid "Toggles whether the CC field is displayed"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:36
-msgid "Toggles whether the From chooser is displayed"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:37
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:39
-msgid "_Bcc Field"
-msgstr "_Bcc-felt"
-
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Cc Field"
-msgstr "_Cc-felt"
-
-#: ui/evolution-message-composer.xml.h:45
-msgid "_From Field"
-msgstr "_Fra-felt"
-
-#: ui/evolution-message-composer.xml.h:47
-msgid "_Insert"
-msgstr "_Inds�t"
-
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "_Inds�t tekstfil..."
-
-#: ui/evolution-message-composer.xml.h:49
-msgid "_Open..."
-msgstr "_�bn..."
-
-#: ui/evolution-message-composer.xml.h:50
-msgid "_Reply-To Field"
-msgstr "_Svar-til felt"
-
-#: ui/evolution-message-composer.xml.h:52
-msgid "_Security"
-msgstr "_Sikkerhed"
-
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Tilf�j mappe p� listen over abonnerede mapper"
-
-#: ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "_Mapper"
-
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List"
-msgstr "L�s listen igen"
-
-#: ui/evolution-subscribe.xml.h:5
-msgid "Refresh List of Folders"
-msgstr "L�s mappelisten igen"
-
-#: ui/evolution-subscribe.xml.h:6
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Fjern mappe fra din liste over abonnerede mapper"
-
-#: ui/evolution-subscribe.xml.h:8
-msgid "Subscribe"
-msgstr "Abonn�r"
-
-#: ui/evolution-subscribe.xml.h:9
-msgid "Unsubscribe"
-msgstr "Fjern abonnement"
-
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Tilegn 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 "M�deforesp_�rgsel"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Genopret"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Genopret fortrudt 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 a_lle (RET)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "S_end statusrapport"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "Overspring genta_gelse"
-
-#: 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 "S�g efter samme streng igen"
-
-#: 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-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Fortryd sidste handling"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
-msgid "_Appointment (FIXME)"
-msgstr "_Aftale (RET)"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_M�rk som fuldf�rt"
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "Svar (RET)"
-
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr "Opret ny opgave"
-
-#: ui/evolution-tasks.xml.h:3
-msgid "New Task"
-msgstr "Ny opgave"
-
-#: ui/evolution-tasks.xml.h:5
-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:9
-msgid "_Task"
-msgstr "_Opgave"
-
-#: ui/evolution.xml.h:1
-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 "_Tilpas v�rkt�jslinjer..."
-
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Personific�r"
-
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Personific�r v�rkt�jslinjer"
-
-#: ui/evolution.xml.h:7
-msgid "Display a different folder"
-msgstr "Vis en anden mappe"
-
-#: ui/evolution.xml.h:8
-msgid "E_xit"
-msgstr "_Afslut"
-
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "Evolution bj�lke_genvej"
-
-#: ui/evolution.xml.h:10
-msgid "Exit the program"
-msgstr "Afslut programmet"
-
-#: ui/evolution.xml.h:11
-msgid "Getting _Started"
-msgstr "Kom _i gang"
-
-#: ui/evolution.xml.h:12
-msgid "Import an external file format"
-msgstr "Import�r et eksternt filformat"
-
-#: ui/evolution.xml.h:13
-msgid "Main toolbar"
-msgstr "Den centrale v�rkt�jslinje"
-
-#: ui/evolution.xml.h:14
-msgid "Show information about Evolution"
-msgstr "Vis oplysninger om Evolution"
-
-#: ui/evolution.xml.h:15
-msgid "Submit Bug Report"
-msgstr "Indsend fejlrapport"
-
-#: ui/evolution.xml.h:16
-msgid "Submit _Bug Report"
-msgstr "Indsend _fejlrapport"
-
-#: ui/evolution.xml.h:17
-msgid "Submit bug report using Bug Buddy."
-msgstr "Indsend fejlrapport med Fejl-Frede."
-
-#: ui/evolution.xml.h:18
-msgid "Toggle whether to show the folder bar"
-msgstr "Sl� visning af mappelinjen til/fra"
-
-#: ui/evolution.xml.h:19
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Sl� visning af genvejslinjen til/fra"
-
-#: ui/evolution.xml.h:20
-msgid "Using the C_ontact Manager"
-msgstr "Bruger behandleren af kontakter"
-
-#: ui/evolution.xml.h:21
-msgid "Using the _Calendar"
-msgstr "Brug af kalenderen"
-
-#: ui/evolution.xml.h:22
-msgid "Using the _Mailer"
-msgstr "Brug af postdelen"
-
-#: ui/evolution.xml.h:23
-msgid "Work Offline"
-msgstr "Arbejd \"offline\""
-
-#: ui/evolution.xml.h:24
-msgid "_About Evolution..."
-msgstr "_Om Evolution..."
-
-#: ui/evolution.xml.h:25
-msgid "_Actions"
-msgstr "H_andlinger"
-
-#: ui/evolution.xml.h:32
-msgid "_Folder Bar"
-msgstr "_Mappelinje"
-
-#: ui/evolution.xml.h:33
-msgid "_Go to Folder..."
-msgstr "_G� til mappe..."
-
-#: ui/evolution.xml.h:35
-msgid "_Import file..."
-msgstr "_Import�r fil..."
-
-#: ui/evolution.xml.h:36
-msgid "_Index"
-msgstr "_Indeks"
-
-#: ui/evolution.xml.h:37
-msgid "_Mail message"
-msgstr "_Afsend besked"
-
-#: ui/evolution.xml.h:39
-msgid "_New Folder"
-msgstr "_Ny mappe"
-
-#: ui/evolution.xml.h:40
-msgid "_Shortcut Bar"
-msgstr "_Genvejslinje"
-
-#. 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:2474
-msgid "%A, %B %d, %Y"
-msgstr "%A den %d. %B %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "Tentative"
-msgstr "Foresl�et"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
-msgid "Busy"
-msgstr "Optaget"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
-msgid "Out of Office"
-msgstr "Ude"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "No Information"
-msgstr "Ingen information"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:408
-msgid "_Invite Others..."
-msgstr "_Invit�r andre..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:428
-msgid "_Options"
-msgstr "_Alternativer"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:445
-msgid "Show _Only Working Hours"
-msgstr "Vis k_un arbejdstid"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:458
-msgid "Show _Zoomed Out"
-msgstr "Vis _zoomet ud"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:476
-msgid "_Update Free/Busy"
-msgstr "_Opdater fri/optaget"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:494
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:511
-msgid "_Autopick"
-msgstr "_Autov�lg"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:525
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:542
-msgid "_All People and Resources"
-msgstr "_Alle mennesker og resurser"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:555
-msgid "All _People and One Resource"
-msgstr "Alle _mennesker og en resurse"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:568
-msgid "_Required People"
-msgstr "_N�dvendige mennesker"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:581
-msgid "Required People and _One Resource"
-msgstr "N�dvendige mennesker _og en resurse"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:604
-msgid "Meeting _start time:"
-msgstr "Tid for m�dets _start:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:628
-msgid "Meeting _end time:"
-msgstr "Tid for m�dets slutning:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:741
-msgid "All Attendees"
-msgstr "Alle deltagere"
-
-#: widgets/menus/gal-view-menus.c:173
-msgid "_Current View"
-msgstr "_Aktiv visning"
-
-#. 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"
-msgstr "mtotfls"
-
-#. 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:215 widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "nu"
-
-#: widgets/misc/e-cell-date-edit.c:239
-msgid "OK"
-msgstr "OK"
-
-#: widgets/misc/e-cell-date-edit.c:720
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "Datoen skal skrives p� formatet: %s"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-filter-bar.c:166
-msgid "Save Search"
-msgstr "Gem s�gning"
-
-#: widgets/misc/e-filter-bar.c:237
-msgid "Advanced Search"
-msgstr "Avanceret s�gning"
-
-#: widgets/misc/e-filter-bar.c:317
-msgid "Advanced ..."
-msgstr "Avanceret..."
-
-#: widgets/misc/e-messagebox.c:152
-msgid "Information"
-msgstr "Information"
-
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Advarsel"
-
-#: widgets/misc/e-messagebox.c:173
-msgid "Question"
-msgstr "Sp�rgsm�l"
-
-#: widgets/misc/e-messagebox.c:180
-msgid "Message"
-msgstr "Besked"
-
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
-msgstr "Vis ikke denne besked igen."
-
-#: widgets/misc/e-search-bar.c:143
-msgid "Sear_ch"
-msgstr "_S�g"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Personlig adressebogs-tjener"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Personlig adressebogs-tjener; kalenderfabrik"
-
-#: wombat/wombat.c:173
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): kunne ikke initiere GNOME-VFS"
-
-#: wombat/wombat.c:185
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): kunne ikke initiere GNOME"
-
-#: wombat/wombat.c:198
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
-
-#~ msgid "PLAIN"
-#~ msgstr "PLAIN"
-
-#~ msgid ""
-#~ "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 brug af PLAIN SASL-mekanismen "
-#~ "hvis tjeneren st�tter det."
-
-#~ msgid "No such host %s."
-#~ msgstr "Ingen v�rt %s."
-
-#~ msgid "Temporarily unable to look up hostname %s."
-#~ msgstr "Midlertidig ude af stand til at sl� v�rtsnavn %s op."
-
-#~ msgid "URL string `%s' contains no protocol"
-#~ msgstr "URL-streng `%s' indeholder ikke protokol"
-
-#~ msgid "URL string `%s' contains an invalid protocol"
-#~ msgstr "URL-streng `%s' indeholder en ugyldig protokol"
-
-#~ msgid "Port number in URL `%s' is non-numeric"
-#~ msgstr "Portnummer i URL `%s' er ikke-numerisk"
-
-#~ msgid "Secure IMAPv4"
-#~ msgstr "Sikker IMAPv4"
-
-#~ msgid "For reading and storing mail on IMAP servers over an SSL connection."
-#~ msgstr ""
-#~ "For l�sning og lagring af e-post p� IMAP-tjenere over en SSL-forbindelse."
-
-#~ msgid "Secure POP"
-#~ 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 "
-#~ "proprietary email systems."
-#~ msgstr ""
-#~ "For tilkobling til POP-tjenere over en SSL-forbindelse. POP-protokollen kan "
-#~ "ogs� bruges for at hente e-post fra visse e-postudbydere via web samt 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"
-#~ msgstr ""
-#~ "For levering af e-post via en ekstern e-posttjener med SMTP over en "
-#~ "SSL-forbindelse.\n"
-
-#~ msgid "No authentication required"
-#~ msgstr "Ingen autenticering kr�vet"
-
-#~ 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 ""
-#~ "Dette alternativ lader dig koble til SMTP-tjeneren uden brug af nogen form "
-#~ "for autentificering. Dette burde virke for opkobling til de fleste "
-#~ "SMTP-servere."
-
-#~ msgid "Remove action"
-#~ msgstr "Fjern handling"
-
-#~ msgid "Remove criterion"
-#~ msgstr "Fjern kriterie"
-
-#~ msgid ""
-#~ "One or more of your servers are not configured correctly.\n"
-#~ "Do you wish to save anyway?"
-#~ msgstr ""
-#~ "En eller flere af dine tjenere er ikke korrekt konfigureret.\n"
-#~ "Vil du lagre likevel?"
-
-#~ msgid "Unspecified"
-#~ msgstr "Uspesifisert"
-
-#~ msgid "Advanced"
-#~ msgstr "Avanceret"
-
-#~ msgid "Check settings"
-#~ msgstr "Tjek indstillinger"
-
-#, fuzzy
-#~ msgid "Email address:"
-#~ msgstr "E-post adresse:"
-
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Konfiguration af Evolution epost"
-
-#~ msgid "Hostname:"
-#~ msgstr "V�rtsnavn:"
-
-#, fuzzy
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-#~ msgid "Include this account when receiving mail"
-#~ msgstr "Ta med denne kontoen n�r du mottar e-post"
-
-#, fuzzy
-#~ msgid "Keep mail on server"
-#~ msgstr "Behold e-post p� tjener"
-
-#~ msgid "Kerberos"
-#~ msgstr "Kerberos"
-
-#~ msgid "Mail"
-#~ msgstr "E-post"
-
-#~ msgid "Mail Account"
-#~ msgstr "Epostkonto"
-
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Konfigurationguide for epost"
-
-#~ msgid "Optional"
-#~ msgstr "Alternativ"
-
-#~ msgid "Password:"
-#~ msgstr "Adgangskode:"
-
-#~ msgid "Plain Text"
-#~ msgstr "Almindelig tekst"
-
-#~ msgid "Remember my password"
-#~ msgstr "Husk min adgangskode"
-
-#, fuzzy
-#~ msgid "Reply address:"
-#~ msgstr "Svaradresse:"
-
-#~ msgid "Required"
-#~ msgstr "N�dvendigt"
-
-#~ msgid "Save password"
-#~ msgstr "Gem adgangskode"
-
-#~ msgid "Select signature file"
-#~ msgstr "V�lg signaturfil"
-
-#, fuzzy
-#~ msgid "Server type:"
-#~ msgstr "Tjenertype:"
-
-#~ msgid "Signature:"
-#~ msgstr "Signatur:"
-
-#~ msgid "Source"
-#~ msgstr "Kilde"
-
-#~ msgid "Transport"
-#~ msgstr "Transport"
-
-#, fuzzy
-#~ msgid "Transport Authentication"
-#~ msgstr "Autenticering for transport"
-
-#~ msgid ""
-#~ "Type the name by which you would like to refer to these servers. For "
-#~ "example: \"Work\" or \"Home\"."
-#~ msgstr ""
-#~ "Indtast navnet som du �nsker at bruge for disse servere. For eksempel: 'job' "
-#~ "eller 'hjemme'."
-
-#, fuzzy
-#~ msgid "User Information"
-#~ msgstr "Information"
-
-#~ msgid "minutes."
-#~ msgstr "minutter."
-
-#~ msgid ""
-#~ "Failed to verify the incoming mail configuration.\n"
-#~ "You may experience problems retrieving your mail from %s"
-#~ msgstr ""
-#~ "Fejl under verificering af konfiguration af indkommende\n"
-#~ "post. Du vil kunne opleve problemer ved henting af e-post fra %s"
-
-#~ msgid ""
-#~ "Failed to verify the outgoing mail configuration.\n"
-#~ "You may experience problems sending your mail using %s"
-#~ msgstr ""
-#~ "Fejl under verificering af konfiguration af udg�ende e-post.\n"
-#~ "Du vil kunne opleve problemer ved sending af e-post gennem %s"
-
-#~ msgid "%s message %d of %d (uid \"%s\")"
-#~ msgstr "%s besked %d af %d (bruger-id \"%s\")"
-
-#~ msgid "[ %s ]"
-#~ msgstr "[ %s ]"
-
-#~ msgid "%s, et al."
-#~ msgstr "%s m.fl."
-
-#~ msgid "<unknown>"
-#~ msgstr "<ukendt>"
-
-#~ msgid "Message _Display"
-#~ msgstr "Mel_dingsvisning"
-
-#~ msgid "_Message Hiding"
-#~ msgstr "_Meldingsskjuling"
-
-#~ msgid "The time is invalid"
-#~ msgstr "Tide er gyldig"
-
-#~ msgid "Edit Filter Rule"
-#~ msgstr "Redig�r filterregel"
-
-#~ msgid "Add Rule"
-#~ msgstr "Tilf�j regel"
-
-#~ msgid "Add VFolder Rule"
-#~ msgstr "Tilf�j regel for VMapper"
-
-#~ msgid "Edit VFolder Rule"
-#~ msgstr "Redig�r VMappe-regel"
-
-#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
-#~ msgstr "Fabrik vil importere Outlook Express 4 breve ind i Evolution."
-
-#~ msgid "Factory to import mbox into Evolution"
-#~ msgstr "Fabrik vil importere mbox ind i Evolution."
-
-#~ msgid "Imports Outlook Express 4 files into Evolution"
-#~ msgstr "Importerer Outlook Express 4-filer ind i Evolution."
-
-#~ msgid "Imports mbox files into Evolution"
-#~ msgstr "Importerer mbox-filer ind i Evolution."
-
-#~ msgid "Disabled"
-#~ msgstr "Deaktiveret"
-
-#~ msgid "Synchronize"
-#~ msgstr "Synkronis�r"
-
-#~ msgid "Copy From Pilot"
-#~ msgstr "Kopi�r fra Pilot"
-
-#~ msgid "Copy To Pilot"
-#~ msgstr "Kopi�r til Pilot"
-
-#~ msgid "Merge From Pilot"
-#~ msgstr "Flet fra Pilot"
-
-#~ msgid "Merge To Pilot"
-#~ msgstr "Flet til Pilot"
-
-#~ msgid "JP Rosevear <jpr@helixcode.com>"
-#~ msgstr "JP Rosevar <jpr@helixcode.com>"
-
-#~ msgid "Original Author:"
-#~ msgstr "Oprindelig forfatter:"
-
-#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-#~ msgstr "Eskil Heyn Olsen <eskil@eazel.com>"
-
-#~ msgid "Evolution Addressbook Conduit"
-#~ msgstr "Evolution adressebogs-komponent"
-
-#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-#~ msgstr "� 1998-2000 the Free Software Foundation og Helix Code"
-
-#~ msgid "Configuration utility for the evolution addressbook conduit.\n"
-#~ msgstr "Konfigurationsv�rkt�j for evolutions adressebogskomponent.\n"
-
-#~ msgid "gnome-unknown.xpm"
-#~ msgstr "gnome-unknown.xpm"
-
-#~ msgid "Synchronize Action"
-#~ msgstr "Synkroniseringshandling"
-
-#~ msgid "Conduit state"
-#~ msgstr "Komponent-tilstand"
-
-#~ msgid ""
-#~ "No pilot configured, please choose the\n"
-#~ "'Pilot Link Properties' capplet first."
-#~ msgstr ""
-#~ "Ingen pilot er konfigureret, v�lg venligst\n"
-#~ "kappleten 'Egenskaber for pilot link' f�rst."
-
-#~ msgid "Not connected to the gnome-pilot daemon"
-#~ msgstr "Ikke tilkoblet gnome-pilot d�mon"
-
-#~ msgid ""
-#~ "An error occured when trying to fetch\n"
-#~ "pilot list from the gnome-pilot daemon"
-#~ msgstr ""
-#~ "En fejl opstod under fors�g p� at hente\n"
-#~ "pilot-listen fra gnome-pilot d�monen"
-
-#~ msgid "Configure the address conduit"
-#~ msgstr "Konfigur�r Udst�ende"
-
-#~ msgid "Evolution Address conduit "
-#~ msgstr "Udst�ende"
-
-#~ msgid "Evolution Calendar Conduit"
-#~ msgstr "Evolution kalender-komponent"
-
-#~ msgid "Configuration utility for the evolution calendar conduit.\n"
-#~ msgstr "Konfigurationsv�rkt�j for evolutions kalenderkomponent.\n"
-
-#~ msgid "Configure the GnomeCal conduit"
-#~ msgstr "Konfigur�r GnomeCal-komponent"
-
-#~ msgid "Evolution Calendar conduit"
-#~ msgstr "Gnome kalender"
-
-#~ msgid "Configure the todo conduit"
-#~ msgstr "Konfigur�r Udst�ende"
-
-#~ msgid "Evolution ToDo conduit "
-#~ msgstr "Udst�ende"
-
-#~ msgid "Evolution ToDo Conduit"
-#~ msgstr "Evolution opgaveliste-komponent"
-
-#~ msgid "Configuration utility for the evolution todo conduit.\n"
-#~ msgstr "Konfigurationsv�rkt�j for evolutions opgavelistekomponent.\n"
-
-#~ msgid "Set Flag"
-#~ msgstr "S�t flag"
-
-#~ msgid "matches regex"
-#~ msgstr "er lik regex"
-
-#~ msgid "Opening Trash folder for %s"
-#~ msgstr "�bner papirkurvs-mappe for %s"
-
-#~ msgid "Getting matches"
-#~ msgstr "Finder tr�ffere"
-
-#~ msgid "Attachment (FIXME: implement me)"
-#~ msgstr "Bilag"
-
-#~ msgid "Quoted (FIXME: implement me)"
-#~ msgstr "Sitert"
-
-#~ msgid "Enter the identity you wish to send this message from"
-#~ msgstr "Indtast identiteten du �nsker at bruge ved sending af denne besked"
-
-#~ msgid "Enter the subject of the mail"
-#~ msgstr "Indtast emnet for meddelelsen"
-
-#~ msgid "Account Properties"
-#~ msgstr "Egenskaber for konto"
-
-#~ msgid "E-Mail Address:"
-#~ msgstr "E-postadresse:"
-
-#~ msgid "Include in \"Get Mail\" operations."
-#~ msgstr "Ta med i \"Hent e-post\"-operationer."
-
-#~ msgid "Incoming Mail Server"
-#~ msgstr "Server for indkommende post"
-
-#~ msgid "Miscellaneous"
-#~ msgstr "Forskelligt"
-
-#~ msgid "Outgoing Mail Server"
-#~ msgstr "Tjener for udg�ende post"
-
-#~ msgid "Servers"
-#~ msgstr "Tjenere"
-
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "Konfiguration af _adressebog..."
-
-#~ msgid "_Print Contacts..."
-#~ msgstr "_Udskriv kontakter..."
-
-#~ msgid "Ca_lendar"
-#~ msgstr "_Kalender"
-
-#~ msgid "Calendar Preferences..."
-#~ msgstr "Ops�tning af kalender"
-
-#~ msgid "_Print this calendar"
-#~ msgstr "_Udskriv denne kalender"
-
-#~ msgid "Create Rule"
-#~ msgstr "Skab regel"
-
-#~ msgid "Fi_lter on Sender"
-#~ msgstr "Filtr�r _efter afsender"
-
-#~ msgid "Filter on Rec_ipients"
-#~ msgstr "Filtr�r efter mod_tager"
-
-#~ msgid "Get Mail"
-#~ msgstr "Hent post"
-
-#~ msgid "Mar_k As Read"
-#~ msgstr "M�rk som _l�st"
-
-#~ msgid "Mark As U_nread"
-#~ msgstr "M�rk som _ul�st"
-
-#~ msgid "Print Preview of message..."
-#~ msgstr "Vis udskrift af besked..."
-
-#~ msgid "Print message..."
-#~ msgstr "Udskriv besked..."
-
-#~ msgid "Reply to _Sender"
-#~ msgstr "Svar til _afsender"
-
-#~ msgid "Show _All Messages"
-#~ msgstr "Vis _alle beskeder"
-
-#~ msgid "_Configure Folder..."
-#~ msgstr "_Konfigur�r folder..."
-
-#~ msgid "_Filter on Subject"
-#~ msgstr "_Filtr�r efter emne"
-
-#~ msgid "_Mail Configuration..."
-#~ msgstr "Konfiguration af epost..."
-
-#~ msgid "_Open in New Window"
-#~ msgstr "_�bn i nyt vindue"
-
-#~ msgid "_Print Message"
-#~ msgstr "_Udskriv besked"
-
-#~ msgid "_Save Message As..."
-#~ msgstr "_Gem besked som..."
-
-#~ msgid "_VFolder on Subject"
-#~ msgstr "_VMappe for emne"
-
-#~ msgid "Customi_ze..."
-#~ msgstr "Personific�r..."
-
-#~ msgid "Show the _Folder Bar"
-#~ msgstr "Vis mappe_bj�lken"
-
-#~ msgid "Show the _Shortcut Bar"
-#~ msgstr "Vis genvejsbj�lken"
-
-#~ msgid "_Settings"
-#~ msgstr "_Indstillinger"
-
-#~ msgid "The priority must be between 1 and 9, inclusive"
-#~ msgstr "Prioriteten skal v�re mellem 0 og 9, inklusive"
-
-#~ msgid "Schedule meeting"
-#~ msgstr "Planl�g m�de"
-
-#~ msgid "Edit this appointment..."
-#~ msgstr "Redig�r denne aftale..."
-
-#~ msgid "New"
-#~ msgstr "Ny"
-
-#~ msgid "Saving changes to message..."
-#~ msgstr "Gemmer �ndringer til besked..."
-
-#~ msgid "Save changes to message..."
-#~ msgstr "Gem �ndringer til besked..."
-
-#~ msgid "Error saving composition to 'Drafts': %s"
-#~ msgstr "Fejl ved gemning af skrivelse til 'Udkast': %s:"
-
-#~ msgid "incoming"
-#~ msgstr "indkommende"
-
-#~ msgid "outgoing"
-#~ msgstr "udg�ende"
-
-#~ msgid "Body or subject contains"
-#~ msgstr "Krop eller emne indeholder"
-
-#~ msgid "Body contains"
-#~ msgstr "Kroppen indeholder"
-
-#~ msgid "Subject contains"
-#~ msgstr "Emnet indeholder"
-
-#~ msgid "Body does not contain"
-#~ msgstr "Krop indeholder ikke"
-
-#~ msgid "Subject does not contain"
-#~ msgstr "Emne indeholder ikke"
-
-#~ msgid "Sender contains"
-#~ msgstr "Afsender indeholder"
-
-#~ msgid "Connect to server"
-#~ msgstr "Opkobl til server"
-
-#~ msgid "Registering local folder"
-#~ msgstr "Registrerer lokal mappe"
-
-#~ msgid ""
-#~ "Unable to register folder '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kunne ikke registrere mappe %s:\n"
-#~ "%s"
-
-#~ msgid "Appending \"%s\""
-#~ msgstr "F�jer til '%s'"
-
-#~ msgid "Appending a message without a subject"
-#~ msgstr "Legger til en besked uden emne"
-
-#~ msgid "Moving messages from \"%s\" into \"%s\""
-#~ msgstr "Flytter meddelelser fra '%s' til %s"
-
-#~ msgid "Copying messages from \"%s\" into \"%s\""
-#~ msgstr "Kopierer beskeder fra '%s' til %s"
-
-#~ msgid "Move messages from \"%s\" into \"%s\""
-#~ msgstr "Flyt meddelelser fra '%s' til %s"
-
-#~ msgid "Copy messages from \"%s\" into \"%s\""
-#~ msgstr "Kopi�r beskeder fra '%s' til %s"
-
-#~ msgid "(No description)"
-#~ msgstr "(Ingen Beskrivelse)"
-
-#~ msgid "Loading %s Folder for %s"
-#~ msgstr "Indl�ser %s-mappe for %s"
-
-#~ msgid "Load %s Folder for %s"
-#~ msgstr "Indl�s %s-mappe for %s"
-
-#~ msgid ""
-#~ "Error while preparing to %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Fejl ved forberedelse til: %s:\n"
-#~ " %s"
-
-#~ msgid ""
-#~ "Error while `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Fejl ved '%s':\n"
-#~ "%s"
-
-#~ msgid "Error reading commands from dispatching thread."
-#~ msgstr "Fejl ved l�sning af kommandoer fra udsender-tr�d."
-
-#~ msgid "Corrupted message from dispatching thread?"
-#~ msgstr "�delagt besked fra udsender-tr�d?"
-
-#~ msgid "Could not create dialog box."
-#~ msgstr "Kunne ikke oprette dialogboks."
-
-#~ msgid "User cancelled query."
-#~ msgstr "Bruger annullerede foresp�rgsel."
-
-#~ msgid ""
-#~ "Cannot open location `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kan ikke �bne stedet %s:\n"
-#~ "%s"
-
-#~ msgid "Get store for \"%s\""
-#~ msgstr "Hent lager for \"%s\""
-
-#~ msgid "Subscribe to folder \"%s\""
-#~ msgstr "Abonn�r p� mappe \"%s\""
-
-#~ msgid "Unsubscribe from folder \"%s\""
-#~ msgstr "Afmeld fra mappe \"%s\""
-
-#~ msgid "All Folders"
-#~ msgstr "Alle mapper"
-
-#~ msgid "Display folders whose name contain:"
-#~ msgstr "Vis mapper hvis navn indeholder:"
-
-#~ msgid "Query"
-#~ msgstr "Foresp�rg"
-
-#~ msgid "Subscribed"
-#~ msgstr "Abonneret"
-
-#~ msgid "Local stores do not have a default folder"
-#~ msgstr "Lokale gemmesteder har ikke en standardmappe"
-
-#~ msgid "Local folders may not be nested."
-#~ msgstr "Lokale mapper kan ikke v�re rekursive."
-
-#~ msgid "Page Set_up"
-#~ msgstr "Skriverops�tning"
-
-#~ msgid "_Object"
-#~ msgstr "_Objekt"
-
-#~ msgid "Ne_xt"
-#~ msgstr "_N�ste"
-
-#~ msgid "_Toolbars"
-#~ msgstr "_V�rkt�jslinjer"
-
-#~ msgid "_Forms"
-#~ msgstr "_Formularer"
-
-#~ msgid "Configure the Evolution Calendar conduit"
-#~ msgstr "Gnome kalender"
-
-#~ msgid "Configure the Evolution ToDo conduit"
-#~ msgstr "Konfigur�r Udest�ende"
-
-#~ msgid "C_lassification:"
-#~ msgstr "_Klassificering"
-
-#~ msgid "Su_mmary"
-#~ msgstr "Sa_mmendrag"
-
-#~ msgid "Time"
-#~ msgstr "Titel"
-
-#~ msgid "description"
-#~ msgstr "beskrivelse"
-
-#~ msgid "Evolution shell factory"
-#~ msgstr "Evolution skal-fabrik"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mr.\n"
-#~ "Mrs.\n"
-#~ "Ms.\n"
-#~ "Miss\n"
-#~ "Dr.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Hr.\n"
-#~ "Fru.\n"
-#~ "Frk.\n"
-#~ "Fr�ken\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 "task-editor-dialog"
-#~ msgstr "task-editor-dialog"
-
-#~ msgid "event-editor-dialog"
-#~ msgstr "event-editor-dialog"
-
-#~ msgid "S_ummary"
-#~ msgstr "_Sammendrag"
-
-#~ msgid "Open..."
-#~ msgstr "_�bn..."
-
-#~ msgid "Days"
-#~ msgstr "Dage"
-
-#~ msgid "Hours"
-#~ msgstr "Timer"
-
-#~ msgid "Mail _to:"
-#~ msgstr "Send _til:"
-
-#~ msgid "Minutes"
-#~ msgstr "Minutter"
-
-#~ msgid "_Audio"
-#~ msgstr "_Lyd"
-
-#~ msgid "_Display"
-#~ msgstr "_Vis"
-
-#~ msgid "_Mail"
-#~ msgstr "_E-post"
-
-#~ msgid "_Program"
-#~ msgstr "_Program"
-
-#~ msgid "Open a calendar"
-#~ msgstr "�bn en kalender"
-
-#~ msgid "Failed to perform regex search on message header: %s"
-#~ msgstr ""
-#~ "Fejl ved udf�relse af s�gning efter regul�rt udtryk i beskedshoved: %s"
-
-#~ msgid "You have no Outbox configured"
-#~ msgstr "Du har ikke konfigureret en udboks"
-
-#~ msgid ""
-#~ "Could not open file %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kunne ikke �bne fil `%s':\n"
-#~ "%s"
-
-#~ msgid "Fetching email from %s"
-#~ msgstr "Henter e-post fra %s"
-
-#~ msgid "Fetch email from %s"
-#~ msgstr "Hent e-post fra %s"
-
-#~ msgid "Filtering email on demand"
-#~ msgstr "Filtrerer e-post efter behov"
-
-#~ msgid "Filter email on demand"
-#~ msgstr "Filtr�r e-post efter behov"
-
-#~ msgid "Sending queue"
-#~ msgstr "Sender k�"
-
-#~ msgid "Send queue"
-#~ msgstr "Send k�"
-
-#~ msgid "Cancel"
-#~ msgstr "Afbryd"
-
-#~ msgid "Examining %s"
-#~ msgstr "Unders�ger %s"
-
-#~ msgid ""
-#~ "Could not read UID cache file \"%s\". You may receive duplicate messages."
-#~ msgstr ""
-#~ "Kunne ikke l�se bufferfil for UID \"%s\". Du kan motta dupliserte beskeder."
-
-#~ msgid "Retrieving message %d of %d"
-#~ msgstr "Henter besked %d af %d"
-
-#~ msgid "Saving changes to %s"
-#~ msgstr "Gemmer �ndringer til %s"
-
-#~ msgid "_Find..."
-#~ msgstr "_Find..."
-
-#~ msgid "_Redo"
-#~ msgstr "_Genopret"
-
-#~ msgid "_Replace..."
-#~ msgstr "_Erstat..."
-
-#~ msgid "_Undo"
-#~ msgstr "_Fortryd"
-
-#~ msgid "Group %i"
-#~ msgstr "Gruppe %i"
-
-#~ msgid "<b>Error loading calendar:<br>Calendar in use."
-#~ msgstr "<b>Fejl ved indl�sning af kalender:<br>Kalender i brug."
-
-#~ msgid "Could not create a tasks file in `%s'"
-#~ msgstr "Kunne ikke oprette en opgavefil i '%s'"
-
-#~ msgid "Could not create a folder in `%s'"
-#~ msgstr "Kunne ikke oprette en mappe i '%s'"
-
-#~ msgid " for "
-#~ msgstr " for "
-
-#~ msgid "Show all hidden"
-#~ msgstr "Vis alle skjulte"
-
-#~ msgid "Hide selected"
-#~ msgstr "Skjul valgte beskeder"
-
-#~ msgid "Hide deleted"
-#~ msgstr "Skjul slettede"
-
-#~ msgid "Hide Subject"
-#~ msgstr "Skjul emne"
-
-#~ msgid "Hide from Sender"
-#~ msgstr "Skjul fra afsender"
-
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Skjul emne '%s'"
-
-#~ msgid "Hide from Sender <%s>"
-#~ msgstr "Skjul fra sender <%s>"
-
-#~ msgid "_Source"
-#~ msgstr "_Kilde"
-
-#~ msgid "UNIX MH-format mail directories (CamelLocal version)"
-#~ msgstr "UNIX MH-formaterede postkataloger (CamelLocal version)"
-
-#~ msgid "UNIX mbox-format mail files (CamelLocal version)"
-#~ msgstr "UNIX e-post filer i mbox-format (CamelLocal version)"
-
-#~ msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
-#~ msgstr "UNIX qmail maildir-formaterede postfiler (CamelLocal version)"
-
-#~ msgid "You have no mail sources configured"
-#~ msgstr "Du har ikke konfigureret nogen kilder for posten"
-
-#~ msgid "Reply-to:"
-#~ msgstr "Svar-til:"
-
-#~ msgid "Calendar Repository"
-#~ msgstr "Kalenderlager"
-
-#~ msgid "Congratulations, your mail configuration is complete.\n"
-#~ msgstr "Tillykke, konfiguration af e-post er fuldf�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."
-#~ msgstr ""
-#~ "Skriv inn dit navn og din e-post adresse for brok i udg�ende post. Du kan "
-#~ "ogs� skrive inn navnet p� din organisation, og navnet p� en signaturfil."
-
-#~ msgid "Full name:"
-#~ msgstr "Fulde navn:"
-
-#~ msgid "Signature File"
-#~ msgstr "Signaturfil:"
-
-#~ msgid "Server:"
-#~ msgstr "Server:"
-
-#~ msgid "Mail source type:"
-#~ msgstr "Type af postkilde:"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "V�lg hvilken type e-post tjener du har, og skriv inn relevant information om "
-#~ "denne.\n"
-#~ "\n"
-#~ "Hvis tjeneren trenger autenticering, kan du klikke p� \"S�g efter st�ttede "
-#~ "typer...\" knappen efter at du har skrevet inn resten af informationen."
-
-#~ msgid "News source type:"
-#~ msgstr "Type af nyheds-kilde:"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "V�lg hvilken type news-tjener du har, og skriv inn relevant information om "
-#~ "denne.\n"
-#~ "\n"
-#~ "Hvis tjeneren trenger autenticering, kan du klikke p� \"S�g efter st�ttede "
-#~ "typer...\"-knappen efter at du har skrevet inn resten af informationen."
-
-#~ 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."
-#~ msgstr ""
-#~ "V�lg hvilken type e-post tjener du har, og skriv inn relevant information om "
-#~ "denne.\n"
-#~ "Hvis tjeneren trenger autenticering, kan du klikke p� \"S�g efter st�ttede "
-#~ "typer...\" knappen efter at du har skrevet inn resten af informationen."
-
-#~ msgid "Add Identity"
-#~ msgstr "Tilf�j identitet"
-
-#~ msgid "Edit Identity"
-#~ msgstr "Redig�r identitet"
-
-#~ msgid "Edit Source"
-#~ msgstr "Redig�r kilde"
-
-#~ msgid "Add News Server"
-#~ msgstr "Tilf�j nyheds-server"
-
-#~ msgid "Edit News Server"
-#~ msgstr "Redig�r nyheds-server"
-
-#~ msgid "The connection was successful!"
-#~ msgstr "Tilkoblingen var vellykket!"
-
-#~ msgid "Querying authorization capabilities of \"%s\""
-#~ msgstr "Sp�rg efter autorisationsegenskaper for \"%s\""
-
-#~ msgid "Query authorization at \"%s\""
-#~ msgstr "Sp�rg efter autorisation hos \"%s\""
-
-#~ msgid "Address"
-#~ msgstr "Adresse"
-
-#~ msgid "Identities"
-#~ msgstr "Identiteter"
-
-#~ msgid "Mail Sources"
-#~ msgstr "Postkilder"
-
-#~ msgid "Mail Transport"
-#~ msgstr "Posttransport"
-
-#~ msgid "News Servers"
-#~ msgstr "Nyheds-servere"
-
-#~ msgid "News Sources"
-#~ msgstr "Nyheds-kilder"
-
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Send meddelser i HTML-format"
-
-#~ msgid "No GPG/PGP support available in this copy of Evolution."
-#~ msgstr "Ingen GPG/PGP-st�tte tilgjengelig i denne versionen af Evolution."
-
-#~ msgid "Server Timeouts"
-#~ msgstr "Tidsafbrud for server"
-
-#~ msgid "Mail Source"
-#~ msgstr "Postkilde"
-
-#~ msgid "Sending a message without a subject"
-#~ msgstr "Sender en besked uden et emne"
-
-#~ msgid "Send a message without a subject"
-#~ msgstr "Send en besked uden et emne"
-
-#, fuzzy
-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "Gemmer besked i mappe"
-
-#, fuzzy
-#~ msgid "Mark messages in folder \"%s\""
-#~ msgstr "Gemmer besked i mappe"
-
-#~ msgid "Marking message %d of %d"
-#~ msgstr "M�rker besked %d af %d"
-
-#~ msgid "Scan folders in \"%s\""
-#~ msgstr "Skanner mapper i '%s'"
-
-#, fuzzy
-#~ msgid "Attaching messages from folder \"%s\""
-#~ msgstr "Gemmer besked i mappe"
-
-#, fuzzy
-#~ msgid "Attach messages from \"%s\""
-#~ msgstr "Flytter meddelelser til %s"
-
-#~ msgid "Forwarding messages \"%s\""
-#~ msgstr "Videresender meddelelser %s"
-
-#~ msgid "Forwarding a message without a subject"
-#~ msgstr "Videresender en meddelelse uden et emne"
-
-#~ msgid "Forward message \"%s\""
-#~ msgstr "Videresendt meddelelse '%s'"
-
-#~ msgid "Forward a message without a subject"
-#~ msgstr "Videresend en meddelelse uden et emne"
-
-#~ msgid ""
-#~ "Failed to generate mime part from message while generating forwarded message."
-#~ msgstr ""
-#~ "Kunne ikke generere MIME-del fra besked under generering af videresendt "
-#~ "besked."
-
-#~ msgid "Creating \"%s\""
-#~ msgstr "Opretter '%s'"
-
-#~ msgid "Exception while reporting result to shell component listener."
-#~ msgstr "Unntak under rapportering af resultat til skallkomponentens lytter."
-
-#, fuzzy
-#~ msgid "Save messages from folder \"%s\""
-#~ msgstr "Gemmer besked i mappe"
-
-#, fuzzy
-#~ msgid "Rebuilding message view"
-#~ msgstr "Sender meddelelse"
-
-#~ msgid "Rebuild message view"
-#~ msgstr "Genopbyg beskedsvisningen"
-
-#~ msgid "Note: When converting between mailbox formats, a failure\n"
-#~ msgstr "Bem�rk: Ved konvertering mellem postboksformater, kan en fejl\n"
-
-#~ msgid "External Directories"
-#~ msgstr "Eksterne kataloger"
-
-#~ msgid "Port Number:"
-#~ msgstr "Portnummer:"
-
-#, fuzzy
-#~ msgid "Outline:"
-#~ msgstr "Udg�ende"
-
-#~ msgid "Headings:"
-#~ msgstr "Overskrifter:"
-
-#~ msgid "Highlighted day:"
-#~ msgstr "Fremh�vet dag:"
-
-#~ msgid "Day numbers:"
-#~ msgstr "Dagnumre:"
-
-#~ msgid "Current day's number:"
-#~ msgstr "Nummer for idag:"
-
-#~ msgid "To-Do item that is not yet due:"
-#~ msgstr "Opgavelisteopf�ring som ikke har g�tt ud enn�:"
-
-#~ msgid "To-Do item that is due today:"
-#~ msgstr "Opgavelisteopf�ring som g�r ud idag:"
-
-#~ msgid "To-Do item that is overdue:"
-#~ msgstr "Opgavelisteopf�ring som har g�et ud:"
-
-#~ msgid "Expunging \"%s\""
-#~ msgstr "T�m '%s'"
-
-#~ msgid "Expunge \"%s\""
-#~ msgstr "T�m '%s'"
-
-#~ msgid "Loading \"%s\""
-#~ msgstr "Indl�ser '%s'"
-
-#~ msgid "Load \"%s\""
-#~ msgstr "Indl�s \"%s\""
-
-#~ msgid "Synchronizing \"%s\""
-#~ msgstr "Synkroniserer '%s'"
-
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Synkronis�r '%s'"
-
-#, fuzzy
-#~ msgid "Displaying message UID \"%s\""
-#~ msgstr "Kopierer beskeder til %s"
-
-#, fuzzy
-#~ msgid "Clearing message display"
-#~ msgstr "Modtager meddelelse %s"
-
-#, fuzzy
-#~ msgid "Display message UID \"%s\""
-#~ msgstr "Kopierer beskeder til %s"
-
-#, fuzzy
-#~ msgid "Opening messages from folder \"%s\""
-#~ msgstr ""
-#~ "Kan ikke hente besked: %s fra mappe %s\n"
-#~ "  %s"
-
-#, fuzzy
-#~ msgid "Open messages from \"%s\""
-#~ msgstr "Kopierer beskeder til %s"
-
-#, fuzzy
-#~ msgid "Viewing messages from folder \"%s\""
-#~ msgstr "Gemmer besked i mappe"
-
-#, fuzzy
-#~ msgid "View messages from \"%s\""
-#~ msgstr "Flytter meddelelser til %s"
-
-#, fuzzy
-#~ msgid "Retrieving message %d of %d (uid \"%s\")"
-#~ msgstr "Henter besked nummer %d af %d (uid \"%s\")"
-
-#~ msgid "N_ew Directory Server"
-#~ msgstr "Ny katalog-tj_ener"
-
-#~ msgid "appointment"
-#~ msgstr "aftale"
-
-#~ msgid "task"
-#~ msgstr "opgave"
-
-#~ msgid "journal entry"
-#~ msgstr "journalpunkt"
-
-#~ msgid "Year:"
-#~ msgstr "�r"
-
-#~ msgid ""
-#~ "Please select the date you want to go to.\n"
-#~ "When you click on a day, you will be taken\n"
-#~ "to that date."
-#~ msgstr ""
-#~ "Venligst v�lg datoen du vil g� til.\n"
-#~ "N�r du klikker p� en dag vil du flytte\n"
-#~ "dig til denne dato"
-
-#~ msgid "_Mail Configuration"
-#~ msgstr "Konfiguration af epost"
-
-#~ msgid "_Save Calendar As"
-#~ msgstr "_Gem kalender som"
-
-#~ msgid "may"
-#~ msgstr "maj"
-
-#~ msgid "sept"
-#~ msgstr "sept"
-
-#~ msgid "sunday"
-#~ msgstr "s�ndag"
-
-#~ msgid "monday"
-#~ msgstr "mandag"
-
-#~ msgid "tuesday"
-#~ msgstr "tirsdag"
-
-#~ msgid "tues"
-#~ msgstr "ti"
-
-#~ msgid "wednesday"
-#~ msgstr "onsdag"
-
-#~ msgid "wednes"
-#~ msgstr "on"
-
-#~ msgid "thursday"
-#~ msgstr "torsdag"
-
-#~ msgid "thur"
-#~ msgstr "to"
-
-#~ msgid "thurs"
-#~ msgstr "to"
-
-#~ msgid "friday"
-#~ msgstr "fredag"
-
-#~ msgid "saturday"
-#~ msgstr "l�rdag"
-
-#~ msgid "fortnight"
-#~ msgstr "14-dage"
-
-#~ msgid "min"
-#~ msgstr "minut"
-
-#~ msgid "sec"
-#~ msgstr "sekund"
-
-#~ msgid "tomorrow"
-#~ msgstr "imorgen"
-
-#~ msgid "yesterday"
-#~ msgstr "ig�r"
-
-#~ msgid "today"
-#~ msgstr "idag"
-
-#~ msgid "last"
-#~ msgstr "sidste"
-
-#~ msgid "this"
-#~ msgstr "denne"
-
-#~ msgid "next"
-#~ msgstr "n�ste"
-
-#~ msgid "first"
-#~ msgstr "f�rste"
-
-#~ msgid "third"
-#~ msgstr "tredje"
-
-#~ msgid "fourth"
-#~ msgstr "fjerde"
-
-#~ msgid "fifth"
-#~ msgstr "femte"
-
-#~ msgid "sixth"
-#~ msgstr "sjette"
-
-#~ msgid "seventh"
-#~ msgstr "syvende"
-
-#~ msgid "eighth"
-#~ msgstr "ottende"
-
-#~ msgid "ninth"
-#~ msgstr "niende"
-
-#~ msgid "tenth"
-#~ msgstr "tiende"
-
-#~ msgid "eleventh"
-#~ msgstr "elvte"
-
-#~ msgid "twelfth"
-#~ msgstr "tolvte"
-
-#~ msgid "ago"
-#~ msgstr "siden"
-
-#~ msgid "Could not create summary"
-#~ msgstr "Kunne ikke oprette sammendrag"
-
-#~ msgid "Cannot get message: %s"
-#~ msgstr "Kan ikke hente besked: %s"
-
-#~ msgid ""
-#~ "For reading mail delivered by the local system, and for storing mail on "
-#~ "local disk."
-#~ msgstr ""
-#~ "For l�sning af e-post leveret af det lokale systemet, og for lagring af "
-#~ "e-post p� lokal disk."
-
-#~ msgid "Could not rename folder %s to %s: destination exists"
-#~ msgstr "Kunne ikke �ndre navn p� mappe %s til %s: m�let eksisterer"
-
-#~ msgid "Mbox folders may not be nested."
-#~ msgstr "Mbox-mapper kan ikke v�re rekursive."
-
-#~ msgid "Could not open summary %s"
-#~ msgstr "Kunne ikke indl�se sammendrag %s"
-
-#, fuzzy
-#~ msgid "Summary mismatch, aborting sync"
-#~ msgstr "Oversigt og mappe uoverensstemmelse, selv efter synkronisering"
-
-#, fuzzy
-#~ msgid "Summary mismatch, X-Evolution header missing"
-#~ msgstr "Oversigt og mappe uoverensstemmelse, selv efter synkronisering"
-
-#, fuzzy
-#~ msgid "Cannot copy data to output file: %s"
-#~ msgstr ""
-#~ "Kan ikke �bne HTML-fil:\n"
-#~ "%s"
-
-#~ msgid "Could not load or create summary"
-#~ msgstr "Kunne ikke indl�se eller oprette sammendrag"
-
-#~ msgid "Cannot append message to mh folder: %s"
-#~ msgstr "Kan ikke tilf�je besked i mh-mappe: %s"
-
-#~ msgid "Could not rename folder `%s': %s"
-#~ msgstr "Kunne ikke �ndre navn p� mappe %s: %s"
-
-#, fuzzy
-#~ msgid "Could not rename folder `%s': %s exists"
-#~ msgstr "Kunne ikke �ndre navn p� mappe %s til %s: %s"
-
-#~ msgid "MH folders may not be nested."
-#~ msgstr "MH-mapper kan ikke v�re rekursive."
-
-#, fuzzy
-#~ msgid "Local mail directory %s"
-#~ msgstr "Lokal e-post-fil %s"
-
-#, fuzzy
-#~ msgid "Bold"
-#~ msgstr "Krop"
-
-#~ msgid "Sets something as bold"
-#~ msgstr "Setter udvalg til fremh�vet"
-
-#, fuzzy
-#~ msgid "Couldn't create pipe to %s: %s"
-#~ msgstr "Kunne ikke oprette r�r til GPG/PGP: %s"
-
-#, fuzzy
-#~ msgid "Could not execute %s: %s\n"
-#~ 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."
-
-#, fuzzy
-#~ msgid "Forward as Attachment"
-#~ msgstr "Vis bilag"
-
-#, fuzzy
-#~ msgid "_New appointment..."
-#~ msgstr "Vis aftaler"
-
-#, fuzzy
-#~ msgid "_Open"
-#~ msgstr "�bn"
-
-#, 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"
-
-#, fuzzy
-#~ msgid "None\n"
-#~ msgstr "Ingen"
-
-#, fuzzy
-#~ msgid ""
-#~ "Incoming\n"
-#~ "Outgoing"
-#~ msgstr "Indkommende"
-
-#, fuzzy
-#~ msgid "window2"
-#~ msgstr "nu"
-
-#~ msgid ""
-#~ "This appointment has custom recurrence rules that cannot be edited by "
-#~ "Evolution.\n"
-#~ "\n"
-#~ "However, the appointment will recur at the appropriate time and will be "
-#~ "displayed properly in the calendar views."
-#~ msgstr ""
-#~ "Denne aftalen har egendefinerte regler for gjeninntreffelse som ikke kan "
-#~ "redigeres af Evolution.\n"
-#~ "\n"
-#~ "Aftalen vil uanset inntreffe til rigtig tid og vil vises korrekt i "
-#~ "kalendervisningene."
-
-#, fuzzy
-#~ msgid "Create to-do item"
-#~ msgstr "Slet dette punkt"
-
-#, fuzzy
-#~ msgid "Edit to-do item"
-#~ msgstr "Udskriv denne ting"
-
-#, fuzzy
-#~ msgid "Due Date:"
-#~ msgstr "Slut-_dato:"
-
-#, fuzzy
-#~ msgid "Item Comments:"
-#~ msgstr ""
-#~ "\n"
-#~ "Kommentar: "
-
-#, fuzzy
-#~ msgid "Time display"
-#~ msgstr "Vis"
-
-#, fuzzy
-#~ msgid "Time format"
-#~ msgstr "Tidsformat:"
-
-#, fuzzy
-#~ msgid "12-hour (AM/PM)"
-#~ msgstr "12 timer (AM/PM)"
-
-#, fuzzy
-#~ msgid "24-hour"
-#~ msgstr "24 timer"
-
-#~ msgid "Weeks start on"
-#~ msgstr "Ugen starter med"
-
-#~ 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"
-#~ "Times outside this range will not be displayed\n"
-#~ "by default."
-#~ msgstr ""
-#~ "Venligst v�lg start og slut-tidene du �nsker\n"
-#~ "der skal vises i dagvisningen og ugevisningen.\n"
-#~ "Tider udenfor dette omr�de vil normalt ikke blive vist."
-
-#, fuzzy
-#~ msgid "Day end:"
-#~ msgstr "Dato:"
-
-#, fuzzy
-#~ msgid "Colors for display"
-#~ msgstr "(Ingen mappe vist)"
-
-#~ msgid "Show on TODO List:"
-#~ msgstr "Vis p� opgavelisten:"
-
-#, fuzzy
-#~ msgid "To Do List style options:"
-#~ msgstr "Vis valgmuligheder"
-
-#, fuzzy
-#~ msgid "Highlight overdue items"
-#~ msgstr "Overskredne opgaver"
-
-#~ msgid "Highlight not yet due items"
-#~ msgstr "M�rk opf�ringer som ikke har g�et ud"
-
-#, fuzzy
-#~ msgid "To Do List Properties"
-#~ msgstr "Egenskaber for konto"
-
-#~ msgid "To Do List"
-#~ msgstr "Oppgaveliste"
-
-#, fuzzy
-#~ msgid "Preferences"
-#~ msgstr "�ndr ops�tning"
-
-#, fuzzy
-#~ msgid "Alarm Properties"
-#~ msgstr "Egenskaber"
-
-#~ msgid "Beep on display alarms"
-#~ msgstr "Pip ved visning af alarmer"
-
-#, fuzzy
-#~ msgid "Audio alarms timeout after"
-#~ msgstr "Alarmer afbrydes efter"
-
-#, fuzzy
-#~ msgid "Enable snoozing for "
-#~ msgstr "Sl� uds�ttelse til for"
-
-#, fuzzy
-#~ msgid "does not match regex"
-#~ msgstr "eksisterer ikke"
-
-#~ msgid ""
-#~ "Welcome to the Evolution Mail configuration wizard!\n"
-#~ "By filling in some information about your email\n"
-#~ "settings, you can start sending and receiving email\n"
-#~ "right away. Click Next to continue."
-#~ msgstr ""
-#~ "Velkommen til Evolution E-post-konfigurationsdruiden!\n"
-#~ "Ved at fylde ud litt information om dine e-post-\n"
-#~ "indstillinger kan du begynde at sende og motta e-post\n"
-#~ "med �n gang. Klik n�ste for at forts�tte."
-
-#~ msgid "Add Optional Fields..."
-#~ msgstr "Legg til tillegsfelt..."
-
-#~ msgid "Additional Identity Fields"
-#~ msgstr "Ekstra identitetsfelt"
-
-#~ msgid "Browse..."
-#~ msgstr "Bla gennem..."
-
-#, fuzzy
-#~ msgid "Edit Mail Configuration Settings"
-#~ msgstr "Konfiguration af epost"
-
-#, fuzzy
-#~ msgid "Preferred type: "
-#~ msgstr "Foretrukket type: "
-
-#~ msgid ""
-#~ "You are almost done with the mail configuration process. The identity, "
-#~ "incoming"
-#~ msgstr ""
-#~ "Du er n�sten f�rdig med konfigurationsprocessen for e-post. Identiteten, "
-#~ "indkommende"
-
-#~ msgid ""
-#~ "Your mail server supports the following types of authentication. Please"
-#~ msgstr "Din e-post tjener st�tter f�lgende typer autenticering. Venligst"
-
-#, fuzzy
-#~ msgid "Threading message list"
-#~ msgstr "Tr�det meddelelsesliste"
-
-#, fuzzy
-#~ msgid "Thread message list"
-#~ msgstr "Tr�det meddelelsesliste"
-
-#, fuzzy
-#~ msgid "_Submit Bug Report"
-#~ msgstr "Indsend fejlrapport"
-
-#, fuzzy
-#~ msgid "Send _Now"
-#~ msgstr "Send"
-
-#, fuzzy
-#~ msgid "Custom search"
-#~ msgstr "Egendefineret genindtr�ffelse"
-
-#~ msgid " (XXX unread)"
-#~ msgstr " (XXX ul�st)"
-
-#~ msgid "Don't know protocol to open URI `%s'"
-#~ msgstr "Ingen protokol for �bning af URI `%s'"
-
-#, fuzzy
-#~ msgid "_Copy to Folder"
-#~ msgstr "Kopi�r til mappe"
-
-#, fuzzy
-#~ msgid "_Move to Folder"
-#~ msgstr "Flyt til folder"
-
-#, fuzzy
-#~ msgid "Recur on the"
-#~ msgstr "den"
-
-#~ msgid "th day of the month"
-#~ msgstr "de dagen i m�neden"
-
-#, fuzzy
-#~ msgid "Open in New Window"
-#~ msgstr "_�bn i nyt vindue"
-
-#, fuzzy
-#~ msgid "Forward Message"
-#~ msgstr "Videresendte meddelelser"
-
-#, fuzzy
-#~ msgid "Copy Message"
-#~ msgstr "Kopierer beskeder"
-
-#, fuzzy
-#~ msgid "Quick Search"
-#~ msgstr "S�g"
-
-#~ msgid "BLARG\n"
-#~ msgstr "BLARG\n"
-
-#~ msgid "Bad storage URL (no server): %s"
-#~ msgstr "Ugyldig URL for lagring (ingen tjener): %s"
-
-#, fuzzy
-#~ msgid "File As"
-#~ msgstr "Gem som:"
-
-#, fuzzy
-#~ msgid "Family Name"
-#~ msgstr "Filnavn:"
-
-#, fuzzy
-#~ msgid "Prim"
-#~ 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:"
-
-#~ msgid ""
-#~ "Minutes\n"
-#~ "Hours\n"
-#~ "Days\n"
-#~ msgstr ""
-#~ "Minutter\n"
-#~ "Timer\n"
-#~ "Dage\n"
-
-#, fuzzy
-#~ msgid "Daily"
-#~ msgstr "Dag"
-
-#, fuzzy
-#~ msgid "Weekly"
-#~ msgstr "Uge"
-
-#, fuzzy
-#~ msgid "Monthly"
-#~ msgstr "M�ned"
-
-#, fuzzy
-#~ msgid "Yearly"
-#~ msgstr "�r"
-
-#, fuzzy
-#~ msgid "Every "
-#~ msgstr "Hver"
-
-#~ msgid ""
-#~ "1st\n"
-#~ "2nd\n"
-#~ "3rd\n"
-#~ "4th\n"
-#~ "5th\n"
-#~ msgstr ""
-#~ "1ste\n"
-#~ "2dre\n"
-#~ "3dje\n"
-#~ "4de\n"
-#~ "5te\n"
-
-#~ msgid ""
-#~ "Monday\n"
-#~ "Tuesday\n"
-#~ "Wednesday\n"
-#~ "Thursday\n"
-#~ "Friday\n"
-#~ "Saturday\n"
-#~ "Sunday\n"
-#~ msgstr ""
-#~ "Mandag\n"
-#~ "Tirsdag\n"
-#~ "Onsdag\n"
-#~ "Torsdag\n"
-#~ "Fredag\n"
-#~ "L�rdag\n"
-#~ "S�ndag\n"
-
-#, fuzzy
-#~ msgid "Ending date"
-#~ msgstr "Slutdato"
-
-#, fuzzy
-#~ msgid "End on "
-#~ msgstr "Dagen slutter:"
-
-#, fuzzy
-#~ msgid "Change"
-#~ msgstr "Foresatte"
-
-#, fuzzy
-#~ msgid "_Unselect All"
-#~ msgstr "V�lg alle"
-
-#, fuzzy
-#~ msgid "FIXME: Print..."
-#~ msgstr "Udskriv..."
-
-#, fuzzy
-#~ msgid "Insert a file as an attachment"
-#~ msgstr "Inds�t en fil som tekst i meddelelsen"
-
-#~ msgid "FIXME: Assign Task..."
-#~ msgstr "Tildel opgave..."
-
-#~ msgid "Assign the task to someone"
-#~ msgstr "Tildel opgaven til nogen"
-
-#, fuzzy
-#~ msgid "FIXME: Ca_lendar..."
-#~ msgstr "_Kalender"
-
-#, fuzzy
-#~ msgid "Save and close this appointment"
-#~ msgstr "Luk denne aftale"
-
-#~ msgid "Invite attendees to a meeting"
-#~ msgstr "Invit�r deltakere til et m�de"
-
-#, fuzzy
-#~ msgid "Cut selected item into clipboard"
-#~ msgstr "Inds�t fra klippebordet"
-
-#, fuzzy
-#~ msgid "Copy selected item into clipboard"
-#~ msgstr "Inds�t fra klippebordet"
-
-#~ msgid "Select recipients' addresses"
-#~ msgstr "V�lg mottakerenes adresser"
-
-#, fuzzy
-#~ msgid "Search..."
-#~ msgstr "S�g"
-
-#, fuzzy
-#~ msgid "To: >>"
-#~ msgstr "Til:"
-
-#, fuzzy
-#~ msgid "Cc: >>"
-#~ msgstr "Cc:"
-
-#, fuzzy
-#~ msgid "Bcc: >>"
-#~ msgstr "Bcc:"
-
-#, fuzzy
-#~ msgid "label9"
-#~ msgstr "etiket26"
-
-#, fuzzy
-#~ msgid "label7"
-#~ msgstr "etiket26"
-
-#, fuzzy
-#~ msgid "label8"
-#~ msgstr "etiket26"
-
-#~ msgid "Load a previously saved message"
-#~ msgstr "Les en tidligere lagret besked"
-
-#, fuzzy
-#~ msgid "_Save..."
-#~ msgstr "_Gem som..."
-
-#, fuzzy
-#~ msgid "Quit the message composer"
-#~ msgstr "Send beskeden senere"
-
-#, fuzzy
-#~ msgid "More criteria"
-#~ msgstr "Fjern kriterie"
-
-#, fuzzy
-#~ msgid "Fewer criteria"
-#~ msgstr "Fjern kriterie"
-
-#~ msgid "Run filter \"%s\""
-#~ msgstr "K�r filter \"%s\""
+#: ui/evolution-mail.xml
\ No newline at end of file
diff --git a/po/de.po b/po/de.po
index 6b29796dde..3e48560c5c 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-04-11 14:41+0200\n"
+"POT-Creation-Date: 2001-04-14 08:51-0400\n"
 "PO-Revision-Date: 2001-04-05 17:23+02:00\n"
 "Last-Translator: Matthias Warkus <mawarkus@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3269
+#: addressbook/backend/ebook/e-card.c:3209
 msgid "Card: "
 msgstr "Karte: "
 
-#: addressbook/backend/ebook/e-card.c:3271
+#: addressbook/backend/ebook/e-card.c:3211
 msgid ""
 "\n"
 "Name: "
@@ -30,7 +30,7 @@ msgstr ""
 "\n"
 "Name: "
 
-#: addressbook/backend/ebook/e-card.c:3272
+#: addressbook/backend/ebook/e-card.c:3212
 msgid ""
 "\n"
 "  Prefix:     "
@@ -38,7 +38,7 @@ msgstr ""
 "\n"
 "  Pr�fix:     "
 
-#: addressbook/backend/ebook/e-card.c:3273
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "  Given:      "
@@ -46,7 +46,7 @@ msgstr ""
 "\n"
 "  Vorname:     "
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3214
 msgid ""
 "\n"
 "  Additional: "
@@ -54,7 +54,7 @@ msgstr ""
 "\n"
 "  Zus�tzlich: "
 
-#: addressbook/backend/ebook/e-card.c:3275
+#: addressbook/backend/ebook/e-card.c:3215
 msgid ""
 "\n"
 "  Family:     "
@@ -62,7 +62,7 @@ msgstr ""
 "\n"
 "  Familienname:     "
 
-#: addressbook/backend/ebook/e-card.c:3276
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "  Suffix:     "
@@ -70,7 +70,7 @@ msgstr ""
 "\n"
 "  Suffix:     "
 
-#: addressbook/backend/ebook/e-card.c:3290
+#: addressbook/backend/ebook/e-card.c:3230
 msgid ""
 "\n"
 "Birth Date: "
@@ -78,7 +78,7 @@ msgstr ""
 "\n"
 "Geburtsdatum: "
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3241
 msgid ""
 "\n"
 "Address:"
@@ -86,7 +86,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3303
+#: addressbook/backend/ebook/e-card.c:3243
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -94,7 +94,7 @@ msgstr ""
 "\n"
 "  Postfach:  "
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3244
 msgid ""
 "\n"
 "  Ext:         "
@@ -102,7 +102,7 @@ msgstr ""
 "\n"
 "  Suffix:        "
 
-#: addressbook/backend/ebook/e-card.c:3305
+#: addressbook/backend/ebook/e-card.c:3245
 msgid ""
 "\n"
 "  Street:      "
@@ -110,7 +110,7 @@ msgstr ""
 "\n"
 "  Stra�e:     "
 
-#: addressbook/backend/ebook/e-card.c:3306
+#: addressbook/backend/ebook/e-card.c:3246
 msgid ""
 "\n"
 "  City:        "
@@ -118,7 +118,7 @@ msgstr ""
 "\n"
 "  Ort:     "
 
-#: addressbook/backend/ebook/e-card.c:3307
+#: addressbook/backend/ebook/e-card.c:3247
 msgid ""
 "\n"
 "  Region:      "
@@ -126,7 +126,7 @@ msgstr ""
 "\n"
 "  Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3308
+#: addressbook/backend/ebook/e-card.c:3248
 msgid ""
 "\n"
 "  Postal Code: "
@@ -134,7 +134,7 @@ msgstr ""
 "\n"
 "  Postleitzahl: "
 
-#: addressbook/backend/ebook/e-card.c:3309
+#: addressbook/backend/ebook/e-card.c:3249
 msgid ""
 "\n"
 "  Country:     "
@@ -142,7 +142,7 @@ msgstr ""
 "\n"
 "  Land:     "
 
-#: addressbook/backend/ebook/e-card.c:3322
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "Delivery Label: "
@@ -150,7 +150,7 @@ msgstr ""
 "\n"
 "Postvermerk: "
 
-#: addressbook/backend/ebook/e-card.c:3334
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "Telephones:\n"
@@ -158,7 +158,7 @@ msgstr ""
 "\n"
 "Telefone:\n"
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3277
 msgid ""
 "\n"
 "Telephone:"
@@ -166,7 +166,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3361
+#: addressbook/backend/ebook/e-card.c:3301
 msgid ""
 "\n"
 "E-mail:\n"
@@ -174,7 +174,7 @@ msgstr ""
 "\n"
 "E-Mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3364
+#: addressbook/backend/ebook/e-card.c:3304
 msgid ""
 "\n"
 "E-mail:"
@@ -182,7 +182,7 @@ msgstr ""
 "\n"
 "E-Mail:"
 
-#: addressbook/backend/ebook/e-card.c:3383
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Mailer: "
@@ -190,7 +190,7 @@ msgstr ""
 "\n"
 "Mailer: "
 
-#: addressbook/backend/ebook/e-card.c:3389
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "Time Zone: "
@@ -198,7 +198,7 @@ msgstr ""
 "\n"
 "Zeitzone: "
 
-#: addressbook/backend/ebook/e-card.c:3397
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Geo Location: "
@@ -206,7 +206,7 @@ msgstr ""
 "\n"
 "Geographischer Ort: "
 
-#: addressbook/backend/ebook/e-card.c:3401
+#: addressbook/backend/ebook/e-card.c:3341
 msgid ""
 "\n"
 "Business Role: "
@@ -214,7 +214,7 @@ msgstr ""
 "\n"
 "Berufsbezeichnung: "
 
-#: addressbook/backend/ebook/e-card.c:3413
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "Org: "
@@ -222,7 +222,7 @@ msgstr ""
 "\n"
 "Firma: "
 
-#: addressbook/backend/ebook/e-card.c:3414
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Name:  "
@@ -230,7 +230,7 @@ msgstr ""
 "\n"
 "  Name:  "
 
-#: addressbook/backend/ebook/e-card.c:3415
+#: addressbook/backend/ebook/e-card.c:3355
 msgid ""
 "\n"
 "  Unit:  "
@@ -238,7 +238,7 @@ msgstr ""
 "\n"
 "  Einheit:  "
 
-#: addressbook/backend/ebook/e-card.c:3416
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "  Unit2: "
@@ -246,7 +246,7 @@ msgstr ""
 "\n"
 "  Einheit2: "
 
-#: addressbook/backend/ebook/e-card.c:3417
+#: addressbook/backend/ebook/e-card.c:3357
 msgid ""
 "\n"
 "  Unit3: "
@@ -254,7 +254,7 @@ msgstr ""
 "\n"
 "  Einheit3: "
 
-#: addressbook/backend/ebook/e-card.c:3418
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Unit4: "
@@ -262,7 +262,7 @@ msgstr ""
 "\n"
 "  Einheit4: "
 
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3362
 msgid ""
 "\n"
 "Categories: "
@@ -270,7 +270,7 @@ msgstr ""
 "\n"
 "Kategorien: "
 
-#: addressbook/backend/ebook/e-card.c:3423
+#: addressbook/backend/ebook/e-card.c:3363
 msgid ""
 "\n"
 "Comment: "
@@ -288,7 +288,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3436
+#: addressbook/backend/ebook/e-card.c:3376
 msgid ""
 "\n"
 "Unique String: "
@@ -296,7 +296,7 @@ msgstr ""
 "\n"
 "Eindeutige Zeichenkette: "
 
-#: addressbook/backend/ebook/e-card.c:3439
+#: addressbook/backend/ebook/e-card.c:3379
 msgid ""
 "\n"
 "Public Key: "
@@ -316,7 +316,7 @@ msgstr "Importiert GnomeCard-Dateien in Evolution."
 #: 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:1089
+#: 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
@@ -332,20 +332,20 @@ msgstr "Cursor konnte nicht geladen werden\n"
 msgid "EBook not loaded\n"
 msgstr "EBook nicht geladen\n"
 
-#: addressbook/conduit/address-conduit.c:651
+#: addressbook/conduit/address-conduit.c:654
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Der Wombat-Server konnte nicht gestartet werden"
 
-#: addressbook/conduit/address-conduit.c:652
+#: addressbook/conduit/address-conduit.c:655
 #: calendar/conduits/calendar/calendar-conduit.c:732
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Wombat konnte nicht gestartet werden"
 
-#: 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 "Adress-Anwendungsblock des konnte Pilot nicht gelesen werden"
 
@@ -449,7 +449,7 @@ msgstr "Firma:"
 
 #: 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
+#: ui/evolution-mail.xml.h:91 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "L�schen"
 
@@ -506,23 +506,21 @@ msgid "This contact belongs to these categories:"
 msgstr "Dieser Kontakt geh�rt in folgende Kategorien:"
 
 #: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/widgets/e-addressbook-view.c:676
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/contact-editor/e-contact-editor.c:1243
 #: addressbook/contact-editor/e-contact-editor.c:1310
-#: addressbook/gui/widgets/e-addressbook-view.c:645
 msgid "Business"
 msgstr "Gesch�ftlich"
 
 #: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:652
 msgid "Business 2"
 msgstr "Gesch�ftlich 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Business Fax"
 msgstr "Gesch�ftliches Fax"
 
@@ -531,7 +529,6 @@ msgid "Callback"
 msgstr "R�ckruf"
 
 #: addressbook/contact-editor/e-contact-editor.c:1247
-#: addressbook/gui/widgets/e-addressbook-view.c:649
 msgid "Car"
 msgstr "Auto"
 
@@ -541,56 +538,54 @@ msgstr "Firma"
 
 #: addressbook/contact-editor/e-contact-editor.c:1249
 #: addressbook/contact-editor/e-contact-editor.c:1311
-#: addressbook/gui/widgets/e-addressbook-view.c:646
 msgid "Home"
 msgstr "Zu Hause"
 
 #: addressbook/contact-editor/e-contact-editor.c:1250
-#: addressbook/gui/widgets/e-addressbook-view.c:653
 msgid "Home 2"
 msgstr "Zu Hause 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Home Fax"
 msgstr "Fax zu Hause"
 
 #: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/contact-editor/e-contact-editor.c:1253
-#: addressbook/gui/widgets/e-addressbook-view.c:648
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/contact-editor/e-contact-editor.c:1254
 #: addressbook/contact-editor/e-contact-editor.c:1312
-#: addressbook/gui/widgets/e-addressbook-view.c:655
 #: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
 msgid "Other"
 msgstr "Andere"
 
 #: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:662
 msgid "Other Fax"
 msgstr "Anderes Fax"
 
 #: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/contact-editor/e-contact-editor.c:1257
-#: addressbook/gui/widgets/e-addressbook-view.c:644
 msgid "Primary"
 msgstr "Prim�r"
 
 #: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/gui/widgets/e-addressbook-view.c:664
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/widgets/e-addressbook-view.c:665
 msgid "Telex"
 msgstr "Telex"
 
@@ -599,12 +594,12 @@ msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: 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:658
+#: addressbook/gui/widgets/e-addressbook-view.c:669
 msgid "Email 3"
 msgstr "E-Mail 3"
 
@@ -617,6 +612,7 @@ msgid "Edit Full"
 msgstr "Voll bearbeiten"
 
 #: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/widgets/e-addressbook-view.c:643
 msgid "Full Name"
 msgstr "Voller Name"
 
@@ -950,12 +946,14 @@ msgid "Addressbook Sources"
 msgstr "Adressbuch-Quellen"
 
 #: 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:6 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "L�schen"
 
@@ -966,7 +964,6 @@ msgid "Edit"
 msgstr "Bearbeiten"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:642
 msgid "Name"
 msgstr "Name"
 
@@ -1046,7 +1043,7 @@ msgstr "Factory f�r die Namenauswahl-Schnittstelle des Adressbuchs"
 
 #: 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:547 filter/filter.glade.h:9
+#: 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 "Entfernen"
@@ -1184,71 +1181,174 @@ 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
 msgid "Save as VCard"
 msgstr "Als VCard speichern"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-minicard.c:669
+#, fuzzy
+msgid "Send contact to other"
+msgstr "Kontakt an anderen senden..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-minicard.c:670
+#, fuzzy
+msgid "Send message to contact"
+msgstr "_Nachricht an Kontakt senden..."
+
+#: 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
+msgid "Print"
+msgstr "Drucken"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-minicard.c:672
+#, fuzzy
+msgid "Print Envelope"
+msgstr "Umschlag drucken..."
+
 #: addressbook/gui/widgets/e-addressbook-view.c:641
 msgid "* Click here to add a contact *"
 msgstr "* Hier klicken, um einen Kontakt hinzuzuf�gen *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/widgets/e-addressbook-view.c:642
+#, fuzzy
+msgid "File As"
+msgstr "Einsortieren unter:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:644
 msgid "Email"
 msgstr "E-Mail"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:645
+#, fuzzy
+msgid "Primary Phone"
+msgstr "Prim�r"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:646
+#, fuzzy
+msgid "Assistant Phone"
+msgstr "Assistent"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:647
+#, fuzzy
+msgid "Business Phone"
+msgstr "Gesch�ftlich 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:648
+#, fuzzy
+msgid "Callback Phone"
+msgstr "R�ckruf"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:649
+#, fuzzy
+msgid "Company Phone"
+msgstr "Firma"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:650
+#, fuzzy
+msgid "Home Phone"
+msgstr "Zu Hause 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:651
 msgid "Organization"
 msgstr "Organisation"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:652
+#, fuzzy
+msgid "Business Address"
+msgstr "Gesch�ftlich 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:653
+#, fuzzy
+msgid "Home Address"
+msgstr "Adresse pr�fen"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:654
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "Mobil"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:658
+#, fuzzy
+msgid "Business Phone 2"
+msgstr "Gesch�ftlich 2"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:659
+#, fuzzy
+msgid "Home Phone 2"
+msgstr "Zu Hause 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:661
+#, fuzzy
+msgid "Other Phone"
+msgstr "Andere Kontakte"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:666
+#, fuzzy
+msgid "TTY"
+msgstr "TTY/TTD"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:667
+#, fuzzy
+msgid "Other Address"
+msgstr "Adresse pr�fen"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:670
 msgid "Web Site"
 msgstr "Website"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/widgets/e-addressbook-view.c:671
 msgid "Department"
 msgstr "Abteilung"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:672
 msgid "Office"
 msgstr "B�ro"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/widgets/e-addressbook-view.c:674
 msgid "Profession"
 msgstr "Beruf"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/widgets/e-addressbook-view.c:675
 msgid "Manager"
 msgstr "Vorgesetzter"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:678
 msgid "Spouse"
 msgstr "Lebenspartner"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:668
+#: addressbook/gui/widgets/e-addressbook-view.c:679
 msgid "Note"
 msgstr "Notiz"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:669
+#: addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Free-busy URL"
 msgstr "Frei/besch�ftigt-URL"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
-msgid "Click here to add a contact"
-msgstr "Hier klicken, um einen Kontakt hinzuzuf�gen"
-
 #: addressbook/gui/widgets/e-minicard-control.c:282
 msgid "Save in addressbook"
 msgstr "In Adressbuch speichern"
 
-#: addressbook/gui/widgets/e-minicard-view.c:165
+#: addressbook/gui/widgets/e-minicard-view.c:166
 msgid ""
 "\n"
 "\n"
@@ -1431,10 +1531,6 @@ msgstr "Typ:"
 msgid "Width:"
 msgstr "Breite:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
-
 #: calendar/conduits/calendar/calendar-conduit.c:687
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
@@ -1469,108 +1565,108 @@ msgstr ""
 "Die Kalender-Ansicht konnte nicht erstellt werden. Bitte �berpr�fen Sie Ihre "
 "ORBit und OAF Einstellungen. "
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:898
+#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
 #: calendar/gui/e-calendar-table.c:330
 msgid "Public"
 msgstr "�ffentlich"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:900
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
 #: calendar/gui/e-calendar-table.c:331
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:902
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
 #: calendar/gui/e-calendar-table.c:332
 msgid "Confidential"
 msgstr "Vertraulich"
 
-#: calendar/gui/calendar-model.c:372 calendar/gui/event-editor.c:1592
+#: 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
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: calendar/gui/calendar-model.c:460
+#: calendar/gui/calendar-model.c:457
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:460
+#: calendar/gui/calendar-model.c:457
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:462
+#: calendar/gui/calendar-model.c:459
 msgid "E"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:462
+#: calendar/gui/calendar-model.c:459
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:500 calendar/gui/calendar-model.c:1066
+#: 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:629
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
 msgid "High"
 msgstr "Hoch"
 
-#: calendar/gui/calendar-model.c:502 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1593
+#: 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:628
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:504 calendar/gui/calendar-model.c:1070
+#: 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:627
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
 msgid "Low"
 msgstr "Niedrig"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1122
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
 #: calendar/gui/e-calendar-table.c:406
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1124
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
 #: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
 msgstr "Opak"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
+#: 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
 msgid "Not Started"
 msgstr "Nicht gestartet"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
+#: 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
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
+#: 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
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
+#: 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:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
+#: camel/camel-service.c:586
 msgid "Cancelled"
 msgstr "Storniert"
 
 #. 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:791 e-util/e-time-utils.c:278
 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:794 e-util/e-time-utils.c:287
 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:799
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1581,7 +1677,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:879
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -1589,17 +1685,17 @@ msgstr ""
 "sein"
 
 #. 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:968
+#: 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:1124
+#: 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
 msgid "None"
 msgstr "Keine"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:967
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1609,39 +1705,39 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1007
 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:1051
+#: calendar/gui/calendar-model.c:1048
 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:1064
+#: calendar/gui/calendar-model.c:1061
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 #: calendar/gui/e-calendar-table.c:355
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1102
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "Die Transparenz muss 'Transparent', 'Opak' oder 'Keine' sein."
 
-#: calendar/gui/calendar-model.c:1595
+#: calendar/gui/calendar-model.c:1571
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: calendar/gui/calendar-model.c:1597
+#: calendar/gui/calendar-model.c:1573
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: calendar/gui/calendar-model.c:1603
+#: calendar/gui/calendar-model.c:1579
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1603
+#: calendar/gui/calendar-model.c:1579
 msgid "No"
 msgstr "Nein"
 
@@ -1879,8 +1975,7 @@ msgid "Pick a color"
 msgstr "Eine Farbe ausw�hlen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165 filter/libfilter-i18n.h:42
-#: filter/libfilter-i18n.h:162
+#: calendar/gui/e-calendar-table.c:165
 msgid "Priority"
 msgstr "Priorit�t"
 
@@ -1987,30 +2082,30 @@ msgstr "Minuten bevor sie auftreten."
 msgid "seconds."
 msgstr "Sekunden."
 
-#: calendar/gui/dialogs/delete-comp.c:68
+#: calendar/gui/dialogs/delete-comp.c:70
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Sind Sie sicher, dass Sie den Termin \"%s\" l�schen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:73
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Sind Sie sicher, dass Sie diesen unbenannten Termin l�schen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:77
+#: calendar/gui/dialogs/delete-comp.c:79
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Sind Sie sicher, dass Sie die Aufgabe `%s' l�schen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:82
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Sind Sie sicher, dass Sie diese unbenannte Aufgabe l�schen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:86
+#: calendar/gui/dialogs/delete-comp.c:88
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Sind Sie sicher, dass Sie den Journaleintrag `%s' l�schen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:89
+#: calendar/gui/dialogs/delete-comp.c:91
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "Sind Sie sicher, dass Sie diesen unbenannten Journaleintrag l�schen wollen?"
@@ -2246,77 +2341,77 @@ msgstr "%02i Minuten-Unterteilungen"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1290
+#: 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"
 
 #. 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-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:1317
+#: 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"
 
 #. 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:302
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
 #: calendar/gui/print.c:617
 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:305
+#: 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-day-view.c:3036 ui/evolution-calendar.xml.h:16
+#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 msgid "New Appointment"
 msgstr "Neuer Termin"
 
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3242
+#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
 msgid "New All Day Event"
 msgstr "Neues ganzt�giges Ereignis"
 
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3247
+#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
 msgid "Go to Today"
 msgstr "Zum heutigen Tag"
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3249
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
 msgid "Go to Date..."
 msgstr "Gehe zu Datum..."
 
-#: calendar/gui/e-day-view.c:3052 calendar/gui/e-week-view.c:3255
+#: 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 "�ffnen"
 
-#: calendar/gui/e-day-view.c:3054 calendar/gui/e-week-view.c:3257
+#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
 msgid "Delete this Appointment"
 msgstr "Diesen Termin l�schen"
 
-#: calendar/gui/e-day-view.c:3056 calendar/gui/e-week-view.c:3259
+#: 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 "Besprechung ansetzen"
 
-#: calendar/gui/e-day-view.c:3065 calendar/gui/e-week-view.c:3272
+#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
 msgid "Make this Occurrence Movable"
 msgstr "Dieses Auftreten beweglich machen"
 
-#: calendar/gui/e-day-view.c:3067 calendar/gui/e-week-view.c:3274
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
 msgid "Delete this Occurrence"
 msgstr "Dieses Auftreten l�schen"
 
-#: calendar/gui/e-day-view.c:3069
+#: calendar/gui/e-day-view.c:3179
 msgid "Delete all Occurrences"
 msgstr "Jedes Auftreten l�schen"
 
@@ -2401,7 +2496,7 @@ msgstr "--an--"
 msgid "Calendar Message"
 msgstr "Kalendermitteilung"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:613
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
 msgid "Date:"
 msgstr "Datum:"
 
@@ -2505,8 +2600,8 @@ msgstr ""
 "Termin\n"
 "ansetzen"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:78
-#: filter/libfilter-i18n.h:178 mail/message-list.c:1017
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
+#: mail/message-list.c:1052
 msgid "Status"
 msgstr "Status"
 
@@ -2537,11 +2632,11 @@ msgstr ""
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/e-week-view.c:3240 calendar/gui/e-week-view.c:3263
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
 msgid "New Appointment..."
 msgstr "Neuer Termin..."
 
-#: calendar/gui/e-week-view.c:3276
+#: calendar/gui/e-week-view.c:3314
 msgid "Delete All Occurrences"
 msgstr "Jedes Auftreten l�schen"
 
@@ -2633,13 +2728,11 @@ msgstr "Anfangszeit:"
 msgid "_Starting date:"
 msgstr "Anfangsdatum:"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:84
-#: filter/libfilter-i18n.h:182
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
 msgid "after"
 msgstr "nach"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:85
-#: filter/libfilter-i18n.h:183
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
 msgid "before"
 msgstr "vor"
 
@@ -2663,35 +2756,27 @@ msgstr "f�r immer"
 msgid "hour(s)"
 msgstr "Stunde(n)"
 
-#: 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
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
 msgid "minute(s)"
 msgstr "Minute(n)"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "month(s)"
 msgstr "Monat(e)"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "start of appointment"
 msgstr "Beginn des Termins"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "until"
 msgstr "bis"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "week(s)"
 msgstr "Woche(n)"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "year(s)"
 msgstr "Jahr(e)"
 
@@ -3042,7 +3127,7 @@ msgstr "Fr"
 msgid "Sa"
 msgstr "Sa"
 
-#: calendar/gui/print.c:948
+#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Auftr�ge"
 
@@ -3078,9 +3163,9 @@ msgstr "Aktuelles Jahr (%Y)"
 msgid "Print Calendar"
 msgstr "Kalender drucken"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1341
+#: 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:30
+#: ui/evolution-mail.xml.h:52
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
@@ -3130,6 +3215,31 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMDMDFS"
 
+#: camel/camel-cipher-context.c:169
+#, fuzzy
+msgid "Signing is not supported by this cipher"
+msgstr "Der angegebene Typ wird f�r diese Speicherweise nicht unterst�tzt"
+
+#: camel/camel-cipher-context.c:207
+#, fuzzy
+msgid "Clearsigning is not supported by this cipher"
+msgstr "Der angegebene Typ wird f�r diese Speicherweise nicht unterst�tzt"
+
+#: camel/camel-cipher-context.c:245
+#, fuzzy
+msgid "Verifying is not supported by this cipher"
+msgstr "Der angegebene Typ wird f�r diese Speicherweise nicht unterst�tzt"
+
+#: camel/camel-cipher-context.c:286
+#, fuzzy
+msgid "Encryption is not supported by this cipher"
+msgstr "Der angegebene Typ wird f�r diese Speicherweise nicht unterst�tzt"
+
+#: camel/camel-cipher-context.c:326
+#, fuzzy
+msgid "Decryption is not supported by this cipher"
+msgstr "Der angegebene Typ wird f�r diese Speicherweise nicht unterst�tzt"
+
 #: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
 msgid "Syncing folders"
 msgstr "Ordner werden synchronisiert"
@@ -3183,7 +3293,7 @@ msgstr "Fehler beim Verarbeiten des Filters: %s: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "Fehler beim Ausf�hren des Filters: %s: %s"
 
-#: camel/camel-filter-search.c:431 camel/camel-filter-search.c:437
+#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fehler beim Ausf�hren einer Filtersuche: %s: %s"
@@ -3302,6 +3412,58 @@ msgstr "(Unbekannter Fehler)"
 msgid "Error copying mail temp file: %s"
 msgstr "Fehler beim Kopieren der tempor�ren Maildatei: %s"
 
+#: camel/camel-pgp-context.c:186
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Bitte geben Sie Ihre %s-Passphrase f�r %s ein."
+
+#: camel/camel-pgp-context.c:189
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Bitte geben Sie Ihre %s-Passphrase ein."
+
+#: camel/camel-pgp-context.c:509
+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
+msgid "No password provided."
+msgstr "Kein Passwort angegeben."
+
+#: 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
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Pipe zu GPG/PGP konnte nicht angelegt werden: %s"
+
+#: camel/camel-pgp-context.c:681
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:871
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:888
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Tempor�re Datei konnte nicht angelegt werden: %s"
+
+#: camel/camel-pgp-context.c:1011
+#, fuzzy
+msgid "No plaintext to encrypt."
+msgstr "Zum Entschl�sseln Icon klicken."
+
+#: camel/camel-pgp-context.c:1037
+msgid "No recipients specified"
+msgstr "Keine Empf�nger angegeben"
+
+#: camel/camel-pgp-context.c:1227
+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."
@@ -3319,37 +3481,37 @@ msgstr "%s konnte nicht geladen werden: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s konnte nicht geladen werden: Kein Initialisationscode im Modul."
 
-#: camel/camel-remote-store.c:189
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s server %s"
 msgstr "%s-Server %s"
 
-#: camel/camel-remote-store.c:193
+#: camel/camel-remote-store.c:190
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s-Dienst f�r %s auf %s"
 
-#: camel/camel-remote-store.c:243
+#: camel/camel-remote-store.c:240
 msgid "Connection cancelled"
 msgstr "Verbindung abgebrochen"
 
-#: camel/camel-remote-store.c:246
+#: camel/camel-remote-store.c:243
 #: camel/providers/smtp/camel-smtp-transport.c:261
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
 
-#: camel/camel-remote-store.c:247
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(unbekannter Rechner)"
 
-#: camel/camel-remote-store.c:328 camel/camel-remote-store.c:390
-#: camel/camel-remote-store.c:461
+#: 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
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
-#: camel/camel-remote-store.c:467
+#: camel/camel-remote-store.c:464
 msgid "Server unexpectedly disconnected"
 msgstr "Verbindung zum Server unerwartet getrennt"
 
@@ -3404,11 +3566,11 @@ msgstr ""
 "Dies verbindet mit dem SMTP-Server und benutzt, falls es der Server "
 "unterst�tzt, ein sicheres CRAM-MD5-Passwort."
 
-#: camel/camel-sasl-digest-md5.c:42
+#: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:44
+#: 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."
@@ -3416,28 +3578,28 @@ msgstr ""
 "Dies verbindet mit dem SMTP-Server und benutzt, falls es der Server "
 "unterst�tzt, ein sicheres DIGEST-MD5-Passwort."
 
-#: camel/camel-sasl-digest-md5.c:802
+#: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Server-Herausforderung zu lang (>2048 Oktette)\n"
 
-#: camel/camel-sasl-digest-md5.c:811
+#: camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge invalid\n"
 msgstr "Server-Herausforderung ung�ltig\n"
 
-#: camel/camel-sasl-digest-md5.c:817
+#: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 "Server-Herausforderung enthielt ung�ltiges \"Quality-of-Protection\"-Token\n"
 
-#: camel/camel-sasl-digest-md5.c:839
+#: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
 msgstr "Serverantwort enthielt keine Legitimationsdaten\n"
 
-#: camel/camel-sasl-digest-md5.c:857
+#: camel/camel-sasl-digest-md5.c:865
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Serverantwort enthielt unvollst�ndige Legitimationsdaten\n"
 
-#: camel/camel-sasl-digest-md5.c:867
+#: camel/camel-sasl-digest-md5.c:875
 msgid "Server response does not match\n"
 msgstr "Antwort des Servers passt nicht\n"
 
@@ -3489,22 +3651,22 @@ msgstr "URL '%s' braucht einen Rechnernamen-Teil"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%ss' braucht einen Pfad-Teil"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:554
 #, c-format
 msgid "Resolving: %s"
 msgstr "%s wird aufgel�st"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:581
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fehler beim Aufl�sen eines Namens: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:606
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: Rechner nicht gefunden"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:608
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: unbekannter Grund"
@@ -3532,12 +3694,12 @@ msgstr ""
 "%s"
 
 #. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:995 mail/mail-ops.c:1002
-#: mail/mail-ops.c:1020 mail/mail-ops.c:1021
+#: 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 "M�ll"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' konnte nicht geparst werden"
@@ -3607,7 +3769,7 @@ msgstr "Nach neuer Mail sehen"
 msgid "Check for new messages in all folders"
 msgstr "In allen Ordnern nach neuer Mail sehen"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:479
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
 msgid "Folders"
 msgstr "Ordner"
 
@@ -3664,7 +3826,6 @@ msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
 #: camel/providers/imap/camel-imap-store.c:518
-#: camel/providers/smtp/camel-smtp-transport.c:411
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3675,17 +3836,17 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:858
+#: camel/providers/imap/camel-imap-store.c:865
 #, c-format
 msgid "%s is not a selectable folder"
 msgstr "%s ist kein w�hlbarer Ordner"
 
-#: camel/providers/imap/camel-imap-store.c:872
+#: camel/providers/imap/camel-imap-store.c:879
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1373
+#: camel/providers/imap/camel-imap-store.c:1382
 msgid "You must be working online to complete this operation"
 msgstr "Sie m�ssen online arbeiten, um diese Aktion abschlie�en zu k�nnen"
 
@@ -3927,7 +4088,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "Zusammenfassung von Ordner kann nicht erstellt werden: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1383
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
 msgid "Synchronising folder"
 msgstr "Ordner wird synchronisiert"
 
@@ -4368,6 +4529,17 @@ msgstr ""
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sBitte geben Sie das SMTP-Passwort f�r %s@%s ein"
 
+#: camel/providers/smtp/camel-smtp-transport.c:411
+#, fuzzy, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"Legitimation beim IMAP-Server konnte nicht erreicht werden.\n"
+"%s\n"
+"\n"
+
 #: camel/providers/smtp/camel-smtp-transport.c:527
 #, c-format
 msgid "SMTP server %s"
@@ -4524,7 +4696,7 @@ msgstr "Anlage hinzuf�gen..."
 msgid "Attach a file to the message"
 msgstr "Eine Datei zu der Nachricht hinzuf�gen"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1017
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
 msgid "Attachment"
 msgstr "Anlage"
 
@@ -4555,25 +4727,25 @@ msgstr "F�r das Adressbuch hier klicken"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:709
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
 msgid "From:"
 msgstr "Von:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:711
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:633
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:713
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
 msgid "To:"
 msgstr "An:"
 
@@ -4581,7 +4753,7 @@ msgstr "An:"
 msgid "Enter the recipients of the message"
 msgstr "Gebe die Empf�nger der Nachricht ein"
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:715
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -5088,7 +5260,7 @@ msgstr ""
 "der Mail."
 
 #: filter/filter-folder.c:222 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:678
+#: mail/mail-account-gui.c:682
 msgid "Select Folder"
 msgstr "Ordner w�hlen"
 
@@ -5113,31 +5285,31 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:624
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Regelname: "
 
-#: filter/filter-rule.c:628
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: filter/filter-rule.c:644
+#: filter/filter-rule.c:646
 msgid "If"
 msgstr "Wenn"
 
-#: filter/filter-rule.c:662
+#: filter/filter-rule.c:664
 msgid "Execute actions"
 msgstr "Aktionen ausf�hren"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:668
 msgid "if all criteria are met"
 msgstr "wenn alle Kriterien zutreffen"
 
-#: filter/filter-rule.c:671
+#: filter/filter-rule.c:673
 msgid "if any criteria are met"
 msgstr "wenn irgendwelche Kriterien zutreffen"
 
-#: filter/filter-rule.c:682
+#: filter/filter-rule.c:684
 msgid "Add criterion"
 msgstr "Kriterium hinzuf�gen"
 
@@ -5206,205 +5378,183 @@ msgstr "Empfangsdatum"
 msgid "Date sent"
 msgstr "Sendedatum"
 
-#: filter/libfilter-i18n.h:15 filter/libfilter-i18n.h:91
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "Gel�scht"
 
-#: filter/libfilter-i18n.h:18 filter/libfilter-i18n.h:98
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "Existieren nicht"
 
-#: filter/libfilter-i18n.h:20 filter/libfilter-i18n.h:99
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "Entwurf"
 
-#: filter/libfilter-i18n.h:25 filter/libfilter-i18n.h:101
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr "Existieren"
 
-#: filter/libfilter-i18n.h:27 filter/libfilter-i18n.h:115
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Ausdruck"
 
-#: filter/libfilter-i18n.h:28 mail/message-list.c:1017
-msgid "Flagged"
-msgstr "Markiert"
-
-#: filter/libfilter-i18n.h:29 filter/libfilter-i18n.h:116
+#: filter/libfilter-i18n.h:14
 msgid "Forward to Address"
 msgstr "Weiterleiten an Adresse"
 
-#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:121
+#: filter/libfilter-i18n.h:15
 msgid "Important"
 msgstr "Wichtig"
 
-#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:139
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "Is Not"
+msgstr "ist nicht"
+
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Is"
+msgstr "I"
+
+#: filter/libfilter-i18n.h:18
 msgid "Mailing list"
 msgstr "Mailingliste"
 
-#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:141
+#: filter/libfilter-i18n.h:19
 msgid "Message Body"
 msgstr "Nachrichtenrumpf"
 
-#: filter/libfilter-i18n.h:36 filter/libfilter-i18n.h:142
+#: filter/libfilter-i18n.h:20
 msgid "Message Header"
 msgstr "Nachrichtenkopf"
 
-#: filter/libfilter-i18n.h:37 filter/libfilter-i18n.h:143
+#: filter/libfilter-i18n.h:21
 msgid "Message was received"
 msgstr "Nachricht wurde empfangen"
 
-#: filter/libfilter-i18n.h:38 filter/libfilter-i18n.h:144
+#: filter/libfilter-i18n.h:22
 msgid "Message was sent"
 msgstr "Nachricht wurde gesendet"
 
-#: filter/libfilter-i18n.h:39 filter/libfilter-i18n.h:145
+#: filter/libfilter-i18n.h:23
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: filter/libfilter-i18n.h:46 filter/libfilter-i18n.h:166
+#: filter/libfilter-i18n.h:24
 msgid "Read"
 msgstr "Gelesen"
 
-#: filter/libfilter-i18n.h:48 filter/libfilter-i18n.h:168
+#: filter/libfilter-i18n.h:25
 msgid "Recipients"
 msgstr "Empf�nger"
 
-#: filter/libfilter-i18n.h:49 filter/libfilter-i18n.h:169
+#: filter/libfilter-i18n.h:26
 msgid "Regex Match"
 msgstr "Regex-Treffer"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:618
-msgid "Seen"
-msgstr "Gelesen"
+#: filter/libfilter-i18n.h:27
+msgid "Replied to"
+msgstr "Beantwortet an"
 
-#: filter/libfilter-i18n.h:53 filter/libfilter-i18n.h:171
-#: filter/score-rule.c:203 filter/score-rule.c:205 mail/message-list.c:1017
+#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
+#: mail/message-list.c:1052
 msgid "Score"
 msgstr "Bewertung"
 
-#: filter/libfilter-i18n.h:55 filter/libfilter-i18n.h:172
+#: filter/libfilter-i18n.h:29
 msgid "Sender"
 msgstr "Absender"
 
-#: filter/libfilter-i18n.h:57 filter/libfilter-i18n.h:64
-msgid "Set Flag"
-msgstr "Marke setzen"
-
-#: filter/libfilter-i18n.h:58 filter/libfilter-i18n.h:66
-#: filter/libfilter-i18n.h:173
+#: filter/libfilter-i18n.h:30
 msgid "Set Status"
 msgstr "Status setzen:"
 
-#: filter/libfilter-i18n.h:59 filter/libfilter-i18n.h:174
-#: filter/libfilter-i18n.h:198
-msgid "sounds like"
-msgstr "klingt wie"
-
-#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:69
-msgid "Source"
-msgstr "Quelle"
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "Source Account"
+msgstr "Account"
 
-#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:72
-#: filter/libfilter-i18n.h:175
+#: filter/libfilter-i18n.h:32
 msgid "Specific header"
 msgstr "Bestimmte Kopfzeile"
 
-#: filter/libfilter-i18n.h:80 filter/libfilter-i18n.h:179
+#: filter/libfilter-i18n.h:34
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:81 filter/libfilter-i18n.h:180
-#: mail/message-list.c:1018
+#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
 msgid "Subject"
 msgstr "Betreff"
 
-#: filter/libfilter-i18n.h:86 filter/libfilter-i18n.h:184
+#: filter/libfilter-i18n.h:38
 msgid "contains"
 msgstr "enth�lt"
 
-#: filter/libfilter-i18n.h:93 filter/libfilter-i18n.h:105
-#: filter/libfilter-i18n.h:185
+#: filter/libfilter-i18n.h:39
 msgid "does not contain"
 msgstr "enth�lt nicht"
 
-#: filter/libfilter-i18n.h:94 filter/libfilter-i18n.h:106
-#: filter/libfilter-i18n.h:186
+#: filter/libfilter-i18n.h:40
 msgid "does not end with"
 msgstr "endet nicht mit"
 
-#: filter/libfilter-i18n.h:95 filter/libfilter-i18n.h:107
-#: filter/libfilter-i18n.h:187
+#: filter/libfilter-i18n.h:41
 msgid "does not exist"
 msgstr "existiert nicht"
 
-#: filter/libfilter-i18n.h:96 filter/libfilter-i18n.h:108
-#: filter/libfilter-i18n.h:188
+#: filter/libfilter-i18n.h:42
 msgid "does not sound like"
 msgstr "klingt nicht wie"
 
-#: filter/libfilter-i18n.h:97 filter/libfilter-i18n.h:109
-#: filter/libfilter-i18n.h:189
+#: filter/libfilter-i18n.h:43
 msgid "does not start with"
 msgstr "beginnt nicht mit"
 
-#: filter/libfilter-i18n.h:100 filter/libfilter-i18n.h:110
-#: filter/libfilter-i18n.h:190
+#: filter/libfilter-i18n.h:44
 msgid "ends with"
 msgstr "endet mit"
 
-#: filter/libfilter-i18n.h:102 filter/libfilter-i18n.h:111
-#: filter/libfilter-i18n.h:191
+#: filter/libfilter-i18n.h:45
 msgid "exists"
 msgstr "existiert"
 
-#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:132
-#: filter/libfilter-i18n.h:149 filter/libfilter-i18n.h:195
-msgid "is"
-msgstr "ist"
-
-#: filter/libfilter-i18n.h:124 filter/libfilter-i18n.h:133
-#: filter/libfilter-i18n.h:192
+#: filter/libfilter-i18n.h:46
 msgid "is greater than"
 msgstr "ist gr��er als"
 
-#: filter/libfilter-i18n.h:125 filter/libfilter-i18n.h:134
-#: filter/libfilter-i18n.h:193
+#: filter/libfilter-i18n.h:47
 msgid "is less than"
 msgstr "ist kleiner als"
 
-#: filter/libfilter-i18n.h:126 filter/libfilter-i18n.h:135
-#: filter/libfilter-i18n.h:194
+#: filter/libfilter-i18n.h:48
 msgid "is not"
 msgstr "ist nicht"
 
-#: filter/libfilter-i18n.h:128
-msgid "matches regex"
-msgstr "passt auf Regex"
+#: filter/libfilter-i18n.h:49
+msgid "is"
+msgstr "ist"
 
-#: filter/libfilter-i18n.h:151 filter/libfilter-i18n.h:157
-#: filter/libfilter-i18n.h:196
+#: filter/libfilter-i18n.h:50
 msgid "on or after"
 msgstr "am oder nach"
 
-#: filter/libfilter-i18n.h:152 filter/libfilter-i18n.h:158
-#: filter/libfilter-i18n.h:197
+#: filter/libfilter-i18n.h:51
 msgid "on or before"
 msgstr "am oder vor"
 
-#: filter/libfilter-i18n.h:170
-msgid "Replied to"
-msgstr "Beantwortet an"
+#: filter/libfilter-i18n.h:52
+msgid "sounds like"
+msgstr "klingt wie"
 
-#: filter/libfilter-i18n.h:176 filter/libfilter-i18n.h:199
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "beginnt mit"
 
-#: filter/libfilter-i18n.h:201
+#: filter/libfilter-i18n.h:54
 msgid "was after"
 msgstr "war nach"
 
-#: filter/libfilter-i18n.h:202
+#: filter/libfilter-i18n.h:55
 msgid "was before"
 msgstr "war vor"
 
@@ -5412,11 +5562,11 @@ msgstr "war vor"
 msgid "Score Rules"
 msgstr "Bewertungsregeln"
 
-#: mail/component-factory.c:332
+#: mail/component-factory.c:329
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutions Mail-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:405
+#: mail/component-factory.c:402
 msgid "Cannot register storage with shell"
 msgstr "Speicher kann nicht bei der Shell registriert werden"
 
@@ -5474,25 +5624,19 @@ msgstr "Nochmals senden"
 msgid "Save As..."
 msgstr "Speichern unter..."
 
-#: 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:29 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Drucken"
-
 #: mail/folder-browser.c:577
 msgid "Reply to Sender"
 msgstr "Antwort an Absender"
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:36
+#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
 msgid "Reply to All"
 msgstr "Allen antworten"
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:14
+#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: mail/folder-browser.c:583
+#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
 msgid "Forward inline"
 msgstr "Im Rumpf weiterleiten"
 
@@ -5512,7 +5656,7 @@ msgstr "In Ordner verschieben..."
 msgid "Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/folder-browser.c:599
+#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
 msgid "Undelete"
 msgstr "L�schen r�ckg�ngig"
 
@@ -5520,7 +5664,7 @@ msgstr "L�schen r�ckg�ngig"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:609
+#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
 msgid "Apply Filters"
 msgstr "Filter anwenden"
 
@@ -5765,7 +5909,7 @@ msgstr "Nachricht speichern unter..."
 msgid "Save Messages As..."
 msgstr "Nachrichten speichern unter..."
 
-#: mail/mail-callbacks.c:1252
+#: mail/mail-callbacks.c:1253
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5774,11 +5918,11 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1301
+#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/mail-callbacks.c:1348
+#: mail/mail-callbacks.c:1349
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
@@ -6096,76 +6240,76 @@ msgstr "An Ort und Stelle betrachten (�ber %s)"
 msgid "Hide"
 msgstr "Verbergen"
 
-#: mail/mail-display.c:1100
+#: mail/mail-display.c:1102
 msgid "Open link in browser"
 msgstr "Link in Browser �ffnen"
 
-#: mail/mail-display.c:1102
+#: mail/mail-display.c:1104
 msgid "Save as (FIXME)"
 msgstr "Speichern unter (FIXME)"
 
-#: mail/mail-display.c:1104
+#: mail/mail-display.c:1106
 msgid "Copy location (FIXME)"
 msgstr "Ort kopieren (FIXME)"
 
-#: mail/mail-format.c:512
+#: mail/mail-format.c:518
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: mail/mail-format.c:554
+#: mail/mail-format.c:560
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "MIME-Nachricht konnte nicht geparst werden. Wird als Quellcode angezeigt."
 
-#: mail/mail-format.c:736
+#: mail/mail-format.c:742
 msgid "Loading message content"
 msgstr "Laden des Nachrichteninhalts"
 
-#: mail/mail-format.c:1025
+#: mail/mail-format.c:1046
 msgid "Encrypted message not displayed"
 msgstr "Verschl�sselte Nachricht nicht angezeigt"
 
-#: mail/mail-format.c:1031
+#: mail/mail-format.c:1052
 msgid "Encrypted message"
 msgstr "Verschl�sselte Nachricht"
 
-#: mail/mail-format.c:1032
+#: mail/mail-format.c:1053
 msgid "Click icon to decrypt."
 msgstr "Zum Entschl�sseln Icon klicken."
 
-#: mail/mail-format.c:1101 mail/mail-format.c:1488
+#: mail/mail-format.c:1137 mail/mail-format.c:1526
 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:1109 mail/mail-format.c:1496
+#: mail/mail-format.c:1145 mail/mail-format.c:1534
 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:1709
+#: mail/mail-format.c:1747
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/mail-format.c:1721
+#: mail/mail-format.c:1759
 #, 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:1725
+#: mail/mail-format.c:1763
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/mail-format.c:1759
+#: mail/mail-format.c:1797
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 
-#: mail/mail-format.c:1764
+#: mail/mail-format.c:1802
 msgid "Malformed external-body part."
 msgstr "Ung�ltiger external-body-Teil."
 
@@ -6255,93 +6399,93 @@ msgstr "Akzeptieren Sie dies?"
 msgid "Evolution progress"
 msgstr "Evolution-Fortschritt"
 
-#: mail/mail-ops.c:588
+#: mail/mail-ops.c:587
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sende \"%s\""
 
-#: mail/mail-ops.c:590
+#: mail/mail-ops.c:589
 msgid "Sending message"
 msgstr "Nachricht senden"
 
-#: mail/mail-ops.c:705
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird gesendet"
 
-#: mail/mail-ops.c:724
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: mail/mail-ops.c:726 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: mail/mail-ops.c:812
+#: mail/mail-ops.c:811
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
-#: mail/mail-ops.c:885
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Machrichten werden nach %s verschoben"
 
-#: mail/mail-ops.c:885
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:900
 msgid "Moving"
 msgstr "Verschiebe"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:903
 msgid "Copying"
 msgstr "Kopiere"
 
-#: mail/mail-ops.c:979
+#: mail/mail-ops.c:978
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Taste Ordner in \"%s\" ab"
 
-#: mail/mail-ops.c:1140
+#: mail/mail-ops.c:1139
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: mail/mail-ops.c:1181 mail/mail-ops.c:1319
+#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ordner %s �ffnen"
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1247
 #, c-format
 msgid "Opening store %s"
 msgstr "�ffnen des Speichers %s"
 
-#: mail/mail-ops.c:1435
+#: mail/mail-ops.c:1434
 msgid "Expunging folder"
 msgstr "S�ubere Ordner"
 
-#: mail/mail-ops.c:1484
+#: mail/mail-ops.c:1483
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s abrufen"
 
-#: mail/mail-ops.c:1551
+#: mail/mail-ops.c:1550
 msgid "Retrieving messages"
 msgstr "Nachrichten abrufen"
 
-#: mail/mail-ops.c:1561
+#: mail/mail-ops.c:1560
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Rufe Nachricht Nummer %d von %d ab (UID \"%s\")"
 
-#: mail/mail-ops.c:1635
+#: mail/mail-ops.c:1634
 msgid "Saving messages"
 msgstr "Nachrichten speichern"
 
-#: mail/mail-ops.c:1714
+#: mail/mail-ops.c:1713
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6350,12 +6494,12 @@ msgstr ""
 "Ausgabedatei konnte nicht erstellt werden: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1727
+#: mail/mail-ops.c:1726
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Nachricht %d von %d (UID \"%s\") speichern"
 
-#: mail/mail-ops.c:1741
+#: mail/mail-ops.c:1740
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6364,11 +6508,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1815
+#: mail/mail-ops.c:1814
 msgid "Saving attachment"
 msgstr "Speichern der Anlage"
 
-#: mail/mail-ops.c:1830
+#: mail/mail-ops.c:1829
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6377,7 +6521,7 @@ msgstr ""
 "Ausgabedatei kann nicht erstellt werden: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1858
+#: mail/mail-ops.c:1857
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
@@ -6460,141 +6604,114 @@ msgstr "Neuer 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:35
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
 msgid "Reply"
 msgstr "Antworten"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:39
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
 msgid "Reply to the sender of this message"
 msgstr "An den Sender der Nachricht antworten"
 
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
 msgid "Reply to all recipients of this message"
 msgstr "allen Empf�ngern der Nachricht antworten"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:16
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
 msgid "Forward this message"
 msgstr "Die Nachricht weiterleiten"
 
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:32
+#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
 msgid "Print the selected message"
 msgstr "Die gew�hlte Nachricht drucken"
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:7
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Die Nachricht l�schen"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:648
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:619
+#: mail/message-list.c:649
+msgid "Seen"
+msgstr "Gelesen"
+
+#: mail/message-list.c:650
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: mail/message-list.c:620
+#: mail/message-list.c:651
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:652
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: mail/message-list.c:625
+#: mail/message-list.c:656
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:657
 msgid "Lower"
 msgstr "Niedriger"
 
-#: mail/message-list.c:630
+#: mail/message-list.c:661
 msgid "Higher"
 msgstr "H�her"
 
-#: mail/message-list.c:631
+#: mail/message-list.c:662
 msgid "Highest"
 msgstr "Am h�chsten"
 
-#: mail/message-list.c:881
+#: mail/message-list.c:912
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:888
+#: mail/message-list.c:919
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: mail/message-list.c:897
+#: mail/message-list.c:928
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:940
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:917
+#: mail/message-list.c:948
 msgid "%b %d %l:%M %p"
 msgstr "%a %d %l:%M %p"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:950
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1018
+#: mail/message-list.c:1052
+msgid "Flagged"
+msgstr "Markiert"
+
+#: mail/message-list.c:1053
 msgid "From"
 msgstr "Von"
 
-#: mail/message-list.c:1018
+#: mail/message-list.c:1053
 msgid "Date"
 msgstr "Datum"
 
-#: mail/message-list.c:1018
+#: mail/message-list.c:1053
 msgid "Received"
 msgstr "Empfangen"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1054
 msgid "To"
 msgstr "An"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1054
 msgid "Size"
 msgstr "Gr��e"
 
-#: mail/openpgp-utils.c:92
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Bitte geben Sie Ihre %s-Passphrase f�r %s ein."
-
-#: mail/openpgp-utils.c:95
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Bitte geben Sie Ihre %s-Passphrase ein."
-
-#: mail/openpgp-utils.c:455 mail/openpgp-utils.c:562 mail/openpgp-utils.c:766
-#: mail/openpgp-utils.c:920 mail/openpgp-utils.c:1079
-msgid "No GPG/PGP program available."
-msgstr "Kein GPG/PGP-Programm verf�gbar."
-
-#: mail/openpgp-utils.c:462 mail/openpgp-utils.c:571 mail/openpgp-utils.c:773
-#: mail/openpgp-utils.c:927
-msgid "No password provided."
-msgstr "Kein Passwort angegeben."
-
-#: mail/openpgp-utils.c:470 mail/openpgp-utils.c:578 mail/openpgp-utils.c:779
-#: mail/openpgp-utils.c:935 mail/openpgp-utils.c:1085
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Pipe zu GPG/PGP konnte nicht angelegt werden: %s"
-
-#: mail/openpgp-utils.c:592
-msgid "No recipients specified"
-msgstr "Keine Empf�nger angegeben"
-
-#: mail/openpgp-utils.c:1096
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Tempor�re Datei konnte nicht angelegt werden: %s"
-
 #: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
 msgid "Folder"
 msgstr "Ordner"
@@ -6905,12 +7022,12 @@ msgstr "Gehe zu Ordner..."
 msgid "(No folder displayed)"
 msgstr "(Kein Ordner angezeigt)"
 
-#: shell/e-shell-view.c:1129
+#: shell/e-shell-view.c:1134
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1131
+#: shell/e-shell-view.c:1136
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
@@ -7151,7 +7268,7 @@ msgstr "Einen Kontakt suchen"
 msgid "New contact"
 msgstr "Neuer Kontakt"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:28
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
 msgid "Previews the message to be printed"
 msgstr "Zeigt eine Vorschau der zu druckenden Nachricht"
 
@@ -7159,7 +7276,7 @@ msgstr "Zeigt eine Vorschau der zu druckenden Nachricht"
 msgid "Print contacts"
 msgstr "Kontakte drucken"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:48
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
 msgid "Stop"
 msgstr "Stopp"
 
@@ -7193,7 +7310,7 @@ msgid "_Search for contacts"
 msgstr "Nach Kontakten _suchen"
 
 #: 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-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"
 msgstr "Werkzeuge"
@@ -7341,7 +7458,7 @@ msgstr "_Neu"
 msgid "_Open Calendar"
 msgstr "Kalender �ffnen"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:75
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
 #: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "Speichern _unter..."
@@ -7372,7 +7489,7 @@ msgid "Print this item"
 msgstr "Diesen Eintrag drucken"
 
 #: 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
+#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Drucken..."
 
@@ -7459,7 +7576,7 @@ msgstr "Diesen Termin abschlie�en"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "In Ordner kopieren... (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Kopieren"
@@ -7570,7 +7687,8 @@ msgstr "Besprechung ansetzen"
 msgid "Schedule some sort of a meeting"
 msgstr "Eine Besprechung ansetzen"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+#: 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 "Alle ausw�hlen"
 
@@ -7648,7 +7766,7 @@ msgstr "Einf�gen"
 msgid "_Print"
 msgstr "Drucken"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:71
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "Eigenschaften..."
@@ -7686,123 +7804,246 @@ msgstr "Einstellungen der Chefsesselansicht..."
 msgid "New Mail"
 msgstr "Neue Mail"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-mail.xml.h:2
+#, fuzzy
+msgid "Apply any new filters to the mail in this box"
+msgstr "Filter auf neue Nachrichten in INBOX dieses Servers anwenden"
+
+#: ui/evolution-mail.xml.h:3
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:4
 msgid "Compose"
 msgstr "Erstellen"
 
-#: ui/evolution-mail.xml.h:2
+#: ui/evolution-mail.xml.h:5
 msgid "Compose a new message"
 msgstr "Eine neue Nachricht erstellen"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Configure Folder..."
+msgstr "In Ordner verschieben..."
+
+#: ui/evolution-mail.xml.h:8
 msgid "Copy message to a new folder"
 msgstr "Die Nachricht in einen neuen Ordner kopieren"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail.xml.h:9
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Die Nachricht in einen neuen Ordner kopieren"
+
+#: ui/evolution-mail.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "_Virtuellen Ordner aus Nachricht erzeugen"
 
-#: ui/evolution-mail.xml.h:8
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Delete the selected messages"
+msgstr "Die gew�hlte Nachricht drucken"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Display all of the message headers"
 msgstr "Alle Nachrichtenkopfzeilen anzeigen"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:15
+#, fuzzy
+msgid "Edit Message"
+msgstr "Nachricht drucken"
+
+#: ui/evolution-mail.xml.h:16
+#, fuzzy
+msgid "Edit the current message"
+msgstr "der aktuellen Zeit"
+
+#: ui/evolution-mail.xml.h:17
 msgid "Empty _Trash"
 msgstr "_M�ll leeren"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Expunge"
+msgstr "S�ubern"
+
+#: ui/evolution-mail.xml.h:19
 msgid "Filter on Se_nder"
 msgstr "Filter �ber Absender"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:20
 msgid "Filter on _Recipients"
 msgstr "Filter �ber Empf�nger"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:21
 msgid "Filter on _Subject"
 msgstr "Filter �ber Betreffzeile"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:22
+msgid "Finaly remove all mails tagged for deletion"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:23
 msgid "Forget _Passwords"
 msgstr "Passw�rter vergessen"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:25
 msgid "Forward As"
 msgstr "Weiterleiten als"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail.xml.h:27
+msgid "Forward the selected mail to someone"
+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.xml.h:30
 msgid "Full _Headers"
 msgstr "Alle _Kopfzeilen"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:31
 msgid "Hide Deleted Messages"
 msgstr "Gel�schte Nachrichten verbergen"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:32
 msgid "Hide S_elected Messages"
 msgstr "Gew�hlte Nachrichten _verbergen"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:33
 msgid "Hide _Deleted Messages"
 msgstr "Ge_l�schte Nachrichten verbergen"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:34
 msgid "Hide _Read messages"
 msgstr "_Gelesene Nachrichten verbergen"
 
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:35
+#, fuzzy
+msgid "Invert Selection"
+msgstr "Auswahl umkehren"
+
+#: ui/evolution-mail.xml.h:36
 msgid "Manage _Subscriptions..."
 msgstr "Abonnements verwalten..."
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:37
 msgid "Mar_k as Read"
 msgstr "Als gelesen markieren"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:38
 msgid "Mark All as R_ead"
 msgstr "Alle als gelesen markieren"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:39
+#, fuzzy
+msgid "Mark As Read"
+msgstr "Als gelesen markieren"
+
+#: ui/evolution-mail.xml.h:40
+#, fuzzy
+msgid "Mark As U_nread"
+msgstr "Als ungelesen markieren"
+
+#: ui/evolution-mail.xml.h:41
 msgid "Mark as U_nread"
 msgstr "Als ungelesen markieren"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:42
+#, fuzzy
+msgid "Mark the selected messages as having been read"
+msgstr "Die gew�hlte Nachricht drucken"
+
+#: ui/evolution-mail.xml.h:43
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:44
 msgid "Move"
 msgstr "Verschieben"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:45
 msgid "Move message to a new folder"
 msgstr "Die Nachricht in einen neuen Ordner verschieben"
 
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:46
+#, fuzzy
+msgid "Move selected messages to another folder"
+msgstr "Die Nachricht in einen neuen Ordner verschieben"
+
+#: ui/evolution-mail.xml.h:47
+#, fuzzy
+msgid "Open in New Window"
+msgstr "Link in Browser �ffnen"
+
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Open the current message in a new window"
+msgstr "Die Nachricht jetzt senden"
+
+#: ui/evolution-mail.xml.h:53
+#, fuzzy
+msgid "Print Preview of message..."
+msgstr "Druckvorschau"
+
+#: ui/evolution-mail.xml.h:54
 msgid "Print message to the printer"
 msgstr "Nachricht auf dem Drucker drucken"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:55
+#, fuzzy
+msgid "Print message..."
+msgstr "Nachricht drucken"
+
+#: ui/evolution-mail.xml.h:58
 msgid "Redirect (FIXME: implement me)"
 msgstr "Umleitung (FIXME: implementier mich)"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:61
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:62
+#, fuzzy
+msgid "Reply to all"
+msgstr "Allen antworten"
+
+#: ui/evolution-mail.xml.h:64
+#, fuzzy
+msgid "Reply to sender"
+msgstr "Antwort an Absender"
+
+#: ui/evolution-mail.xml.h:66
 msgid "S_ource"
 msgstr "Quelle"
 
-#: ui/evolution-mail.xml.h:41 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "Save the message into a new file"
+msgstr "Die Nachricht in einem bestimmten Ordner speichern"
+
+#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Alle ausw�hlen"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:70
 msgid "Select _Thread"
 msgstr "Strang ausw�hlen"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:71
 msgid "Send / Receive"
 msgstr "Senden / Empfangen"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:72
+msgid "Send a reply to the person who sent you this mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:73
+msgid "Send a single mail in reply to all the selected mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:74
 msgid ""
 "Send queued mail\n"
 "    and retrieve new mail"
@@ -7810,119 +8051,125 @@ msgstr ""
 "Mail in Warteschlange senden\n"
 "    und neue Mail abholen"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:76
 msgid "Send queued mail and retrieve new mail"
 msgstr "Mail in der Warteschlange senden und neue Mail abholen"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:77
 msgid "Show _All"
 msgstr "Alle zeigen"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:79
 msgid "Threaded Message list"
 msgstr "Nachrichtenliste in Str�nge geordnet"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:80
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "Die gew�hlte Nachricht drucken"
+
+#: ui/evolution-mail.xml.h:82
 msgid "VFolder on Se_nder"
 msgstr "VOrdner �ber Absender"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:83
 msgid "VFolder on _Recipients"
 msgstr "VOrdner �ber Empf�nger"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:84
 msgid "VFolder on _Subject"
 msgstr "VOrdner �ber Betreffzeile"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:85
 msgid "View Raw Message Source"
 msgstr "Nachrichtenquellcode anzeigen"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:86
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor f�r virtuelle Ordner..."
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:87
 msgid "_Apply Filters"
 msgstr "Filter _anwenden"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:88
 msgid "_Attachment"
 msgstr "_Anlage"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Compose"
-msgstr "Erstellen"
-
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:89
 msgid "_Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:90
 msgid "_Create Filter From Message"
 msgstr "Filter aus Nachricht erzeugen"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:92
 msgid "_Expunge"
 msgstr "S�ubern"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:93
 msgid "_Filters..."
 msgstr "_Filter..."
 
-#: ui/evolution-mail.xml.h:63 ui/evolution.xml.h:31
+#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
 msgid "_Folder"
 msgstr "Ordner"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:95
 msgid "_Forward"
 msgstr "Weiterleiten"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:96
 msgid "_Inline"
 msgstr "An _Ort und Stelle"
 
-#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Auswahl umkehren"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:98
 msgid "_Mail Message"
 msgstr "Nachricht verschicken"
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:99
 msgid "_Mail Settings..."
 msgstr "Mail-Einstellungen..."
 
-#: ui/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:100
 msgid "_Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail.xml.h:101
 msgid "_Open Selected Items"
 msgstr "Gew�hlte Objekte �ffnen"
 
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail.xml.h:103
 msgid "_Quoted"
 msgstr "_Umschrieben"
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail.xml.h:104
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail.xml.h:105
 msgid "_Resend Messages"
 msgstr "Nachrichten _nochmals senden"
 
-#: ui/evolution-mail.xml.h:76
+#: ui/evolution-mail.xml.h:107
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Nachricht speichern unter..."
+
+#: ui/evolution-mail.xml.h:108
 msgid "_Send / Receive"
 msgstr "_Senden / Empfangen"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:109
 msgid "_Threaded"
 msgstr "In S_tr�ngen"
 
-#: ui/evolution-mail.xml.h:79
+#: ui/evolution-mail.xml.h:111
 msgid "_Undelete"
 msgstr "L�schen r�ckg�ngig"
 
@@ -8410,6 +8657,10 @@ msgstr "Alle Anwesenden"
 msgid "_Current View"
 msgstr "Aktuelle Ansicht"
 
+#: widgets/menus/gal-view-menus.c:196
+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
@@ -8471,10 +8722,50 @@ msgstr "Meldung"
 msgid "Don't show this message again."
 msgstr "Diese Meldung nicht mehr anzeigen."
 
-#: widgets/misc/e-search-bar.c:147
+#: widgets/misc/e-search-bar.c:148
 msgid "Sear_ch"
 msgstr "Su_chen"
 
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Adress Cards"
+msgstr "Adresskarte"
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "Firma"
+
+#: views/addressbook/galview.xml.h:3
+#, fuzzy
+msgid "Phone List"
+msgstr "Telefon-Typen"
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "Absender"
+
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "Status"
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "Betreff"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "Meldung"
+
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With Category"
+msgstr "Kategorie:"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "Der pers�nliche Adressbuchserver"
@@ -8494,3 +8785,30 @@ 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 "Click here to add a contact"
+#~ msgstr "Hier klicken, um einen Kontakt hinzuzuf�gen"
+
+#~ msgid "label26"
+#~ msgstr "label26"
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "label55"
+#~ msgstr "label55"
+
+#~ msgid "Set Flag"
+#~ msgstr "Marke setzen"
+
+#~ msgid "Source"
+#~ msgstr "Quelle"
+
+#~ msgid "matches regex"
+#~ msgstr "passt auf Regex"
+
+#~ msgid "No GPG/PGP program available."
+#~ msgstr "Kein GPG/PGP-Programm verf�gbar."
+
+#~ msgid "_Compose"
+#~ msgstr "Erstellen"
diff --git a/po/el.po b/po/el.po
index da96440530..303c9a121c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -2,11 +2,10 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Spiros Papadimitriou <spapadim+@cs.cmu.edu>, 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-04-14 08:51-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"
@@ -14,366 +13,197 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
-
-#: 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
-#, fuzzy
-msgid "Could not initialize Bonobo"
-msgstr "������ ���/�����: ������������ ��� Bonobo �������"
-
-#: addressbook/gui/widgets/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:101
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr ""
-
-#: 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 "�������� ��� ���������"
-
-#: 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 "��������"
-
-#: 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
-#, c-format
-msgid "Close %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:68
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "���������� ��� �������..."
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "_���� ��������"
-
-#: executive-summary/component/e-summary.c:919
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr "���������� ��� ��������� ���� ����������� �������"
-
-#: executive-summary/component/e-summary.c:933
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "�������� �������� ���������"
-
-#: 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"
-msgstr ""
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "New"
-msgstr "_���"
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "���������� ��� �������..."
-
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
-
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "������ ���/�����: ������������ ��� Bonobo �������"
-
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3209
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3211
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3212
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3054
+#: addressbook/backend/ebook/e-card.c:3214
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3215
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3070
+#: addressbook/backend/ebook/e-card.c:3230
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3241
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3243
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3244
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3245
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3246
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3247
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3248
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3249
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3102
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3117
+#: addressbook/backend/ebook/e-card.c:3277
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3301
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3144
+#: addressbook/backend/ebook/e-card.c:3304
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3163
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3169
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3177
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3341
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3355
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3196
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3357
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3362
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3203
+#: addressbook/backend/ebook/e-card.c:3363
 msgid ""
 "\n"
 "Comment: "
@@ -389,135 +219,38 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3376
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3219
+#: addressbook/backend/ebook/e-card.c:3379
 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"
-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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
+msgid "Factory to import GnomeCard files into Evolution."
 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/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
+msgid "Imports GnomeCard files into Evolution."
 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:"
-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>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-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
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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/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
 #, fuzzy
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"�������� �������� ���� ��� �������� ��������� ��������� �� PersistStream ��� "
-"�� ������"
+msgid "Could not initialize Bonobo"
+msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
@@ -527,354 +260,448 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:655
+#: calendar/conduits/calendar/calendar-conduit.c:732
+#: calendar/conduits/todo/todo-conduit.c:546
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
+#: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:690
 msgid "Could not read pilot's Address application block"
 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
-msgid "_Add"
+#: 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"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-msgid "_Delete"
+#: addressbook/contact-editor/contact-editor.glade.h:2
+msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
+#: addressbook/contact-editor/contact-editor.glade.h:3
+msgid "B_usiness"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
+#: addressbook/contact-editor/contact-editor.glade.h:4
+msgid "Business _Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
+#: 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
+msgid "Ca_tegories..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
+#: addressbook/contact-editor/contact-editor.glade.h:7
 #, fuzzy
 msgid "Contact Editor"
 msgstr "_��������"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
+#: addressbook/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+msgid "Details"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
+#: addressbook/contact-editor/contact-editor.glade.h:9
 msgid "File As:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
+#: addressbook/contact-editor/contact-editor.glade.h:10
+#: executive-summary/component/executive-summary-config.glade.h:3
+msgid "General"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
+#: addressbook/contact-editor/contact-editor.glade.h:11
+msgid "New phone type"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
+#: addressbook/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "_Home"
+msgid "No_tes:"
 msgstr "������_��"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
+#: addressbook/contact-editor/contact-editor.glade.h:13
+msgid "Phone Types"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-#, fuzzy
-msgid "_Mobile"
-msgstr "_������"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
+#: addressbook/contact-editor/contact-editor.glade.h:14
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "Primary Email"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
+#: addressbook/contact-editor/contact-editor.glade.h:15
+msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
+#: addressbook/contact-editor/contact-editor.glade.h:16
+msgid "Web page address:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-#, fuzzy
-msgid "C_ontacts..."
-msgstr "_��������"
+#: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:74
+msgid "_Add"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
+#: addressbook/contact-editor/contact-editor.glade.h:18
+msgid "_Address..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-#, fuzzy
-msgid "_Job title:"
-msgstr "_������"
+#: addressbook/contact-editor/contact-editor.glade.h:19
+msgid "_Assistant's name:"
+msgstr ""
+
+#: addressbook/contact-editor/contact-editor.glade.h:20
+msgid "_Birthday:"
+msgstr ""
+
+#: addressbook/contact-editor/contact-editor.glade.h:21
+msgid "_Business"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "_Company:"
 msgstr "���������"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
+#: 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"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
+#: addressbook/contact-editor/contact-editor.glade.h:24
 msgid "_Department:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
+#: addressbook/contact-editor/contact-editor.glade.h:25
+msgid "_Full Name..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
-msgstr ""
+#: addressbook/contact-editor/contact-editor.glade.h:26
+#, fuzzy
+msgid "_Home"
+msgstr "������_��"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
+#: addressbook/contact-editor/contact-editor.glade.h:27
+#, fuzzy
+msgid "_Job title:"
+msgstr "_������"
+
+#: addressbook/contact-editor/contact-editor.glade.h:28
+msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
+#: addressbook/contact-editor/contact-editor.glade.h:29
+#, fuzzy
+msgid "_Mobile"
+msgstr "_������"
+
+#: addressbook/contact-editor/contact-editor.glade.h:30
+msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
+#: addressbook/contact-editor/contact-editor.glade.h:31
+msgid "_Office:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
+#: addressbook/contact-editor/contact-editor.glade.h:32
+msgid "_Profession:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
+#: addressbook/contact-editor/contact-editor.glade.h:33
+msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
+#: addressbook/contact-editor/contact-editor.glade.h:34
+msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 #, fuzzy
-msgid "No_tes:"
-msgstr "������_��"
+msgid "Delete Contact?"
+msgstr "�������� ���������"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
+#: addressbook/contact-editor/e-contact-editor.c:603
+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/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/widgets/e-addressbook-view.c:676
 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/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1310
 msgid "Business"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/contact-editor/e-contact-editor.c:1244
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "Car"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1248
 #, fuzzy
 msgid "Company"
 msgstr "���������"
 
-#: 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/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1311
 #, fuzzy
 msgid "Home"
 msgstr "������_��"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/contact-editor/e-contact-editor.c:1250
 #, fuzzy
 msgid "Home 2"
 msgstr "������_��"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:657
 #, fuzzy
 msgid "Home Fax"
 msgstr "������_��"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/contact-editor/e-contact-editor.c:1253
 #, fuzzy
 msgid "Mobile"
 msgstr "_������"
 
-#: 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/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"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:662
 msgid "Other Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/widgets/e-addressbook-view.c:663
 #, fuzzy
 msgid "Pager"
 msgstr "����������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
+#: addressbook/contact-editor/e-contact-editor.c:1257
 #, fuzzy
 msgid "Primary"
 msgstr "�������������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/gui/widgets/e-addressbook-view.c:664
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/widgets/e-addressbook-view.c:665
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/contact-editor/e-contact-editor.c:1260
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: 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:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/gui/widgets/e-addressbook-view.c:669
 msgid "Email 3"
 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/fullname-strings.h:7
+#: addressbook/contact-editor/e-contact-quick-add.c:223
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:225
+#, fuzzy
+msgid "Edit Full"
+msgstr "_��������"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/widgets/e-addressbook-view.c:643
+#, fuzzy
+msgid "Full Name"
+msgstr "����������� ������"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:268
+#, fuzzy
+msgid "E-mail"
+msgstr "_������"
+
+#: addressbook/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Canada"
+msgstr "����������"
+
+#: addressbook/contact-editor/fulladdr.glade.h:3
+msgid "Check Address"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:5
+msgid "Finland"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:6
+msgid "USA"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:7
+msgid "_Address:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:8
+#, fuzzy
+msgid "_City:"
+msgstr "�������������"
+
+#: addressbook/contact-editor/fulladdr.glade.h:9
+msgid "_PO Box:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:10
+msgid "_State/Province:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:11
+msgid "_ZIP Code:"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
+#: addressbook/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/contact-editor/fullname.glade.h:3
+msgid "Esq."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:4
+msgid "I"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:5
+msgid "II"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:8
+msgid "Miss"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:12
+msgid "Sr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
+#: addressbook/contact-editor/fullname.glade.h:14
+msgid "_Last:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname.glade.h:15
 #, fuzzy
 msgid "_Middle:"
 msgstr "_������"
 
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
+#: addressbook/contact-editor/fullname.glade.h:16
+msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
+#: addressbook/contact-editor/fullname.glade.h:17
+msgid "_Title:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:231
+#: addressbook/gui/component/addressbook.c:241
 msgid "As _Minicards"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:247
+#: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:374
+#: addressbook/gui/component/addressbook.c:399
 #, c-format
 msgid "Enter password for %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:402
+#: addressbook/gui/component/addressbook.c:427
 #, fuzzy
 msgid "Unable to open addressbook"
 msgstr "���� ��� ��� �� ���������������"
 
-#: addressbook/gui/component/addressbook.c:407
+#: 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"
@@ -886,227 +713,611 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:555
 msgid "Show All"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
+#: addressbook/gui/component/addressbook.c:557
 #, fuzzy
 msgid "Advanced..."
 msgstr "��������� ��� �������������"
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:587
 #, fuzzy
 msgid "Any field contains"
 msgstr "������� ��� �������� ������������"
 
-#: addressbook/gui/component/addressbook.c:563
+#: addressbook/gui/component/addressbook.c:588
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:564
+#: addressbook/gui/component/addressbook.c:589
 #, fuzzy
 msgid "Email contains"
 msgstr "����� ���������"
 
-#: addressbook/gui/component/addressbook.c:707
+#: addressbook/gui/component/addressbook.c:732
 msgid "The URI that the Folder Browser will display"
 msgstr "�� URI ��� �� ��������� � ����������� ��������"
 
-#: addressbook/gui/component/addressbook-storage.c:95
+#: addressbook/gui/component/addressbook-storage.c:99
 #, fuzzy
 msgid "Other Contacts"
 msgstr "������ ������������"
 
-#: addressbook/gui/component/addressbook-config.c:139
+#: addressbook/gui/component/addressbook-config.c:148
 #, fuzzy
 msgid "LDAP Server"
 msgstr "��� �����"
 
-#: addressbook/gui/component/addressbook-config.c:141
+#: addressbook/gui/component/addressbook-config.c:150
 #, fuzzy
 msgid "File"
 msgstr "_��������"
 
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/component/addressbook-config.c:153
 #, fuzzy
 msgid "Unknown addressbook type"
 msgstr "���� ��� ��� �� ���������������"
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/component/addressbook-config.c:163
 msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
+#: 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-store.c:146
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
 msgid "Password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:157
+#: addressbook/gui/component/addressbook-config.c:167
 msgid "SASL"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
+#: addressbook/gui/component/addressbook-config.c:170
 msgid "Unknown auth type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:169
+#: addressbook/gui/component/addressbook-config.c:179
 #, fuzzy
 msgid "Base"
 msgstr "����������"
 
-#: addressbook/gui/component/addressbook-config.c:171
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:173
+#: addressbook/gui/component/addressbook-config.c:183
 #, fuzzy
 msgid "Subtree"
 msgstr "��� ����������"
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:186
 msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:309
+#: addressbook/gui/component/addressbook-config.c:353
 msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:311
+#: 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:360
+#: addressbook/gui/component/addressbook-config.c:406
+#: mail/mail-config.glade.h:28
 msgid "Host:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:361
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:409
 #, fuzzy
 msgid "Port:"
 msgstr "�������������"
 
-#: addressbook/gui/component/addressbook-config.c:364
+#: 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:384
+#: 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:438
+#: addressbook/gui/component/addressbook-config.c:489
 msgid "Authentication:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:455
+#: addressbook/gui/component/addressbook-config.c:507
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Path:"
 msgstr "����������"
 
-#: addressbook/gui/component/addressbook-config.c:460
+#: 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:593
+#: addressbook/gui/component/addressbook-config.c:647
 #, fuzzy
 msgid "Edit Addressbook"
 msgstr "���� ��� ��� �� ���������������"
 
-#: addressbook/gui/component/addressbook-config.c:595
+#: addressbook/gui/component/addressbook-config.c:649
 #, fuzzy
 msgid "Add Addressbook"
 msgstr "���� ��� ��� �� ���������������"
 
-#: addressbook/gui/component/addressbook-config.c:611
+#: 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:616
+#: addressbook/gui/component/addressbook-config.c:671
+#: mail/mail-config.glade.h:35
 msgid "Name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:617
+#: 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/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
+#: 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
+#, fuzzy
+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 ""
+
+#: 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/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: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
 msgid "Search"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
+#: addressbook/gui/widgets/alphabet.glade.h:1
+msgid "123"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:2
+msgid "a"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:3
+msgid "b"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:4
+msgid "c"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:5
+msgid "d"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:6
+msgid "e"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:7
+msgid "f"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:8
+msgid "g"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:9
+msgid "h"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:10
+msgid "i"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:11
+msgid "j"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:12
+msgid "k"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:13
+msgid "l"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:14
+msgid "m"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:15
+#, fuzzy
+msgid "n"
+msgstr "����"
+
+#: addressbook/gui/widgets/alphabet.glade.h:16
+#, fuzzy
+msgid "o"
+msgstr "����"
+
+#: addressbook/gui/widgets/alphabet.glade.h:17
+msgid "p"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:18
+msgid "q"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:19
+#, fuzzy
+msgid "r"
+msgstr "���"
+
+#: addressbook/gui/widgets/alphabet.glade.h:20
+msgid "s"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:21
+msgid "t"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:22
+msgid "u"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:23
+msgid "v"
+msgstr ""
+
+#: 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-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
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-msgid "Name"
+#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-minicard.c:669
+msgid "Send contact to other"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:566
+#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-minicard.c:670
+#, 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
+#, fuzzy
+msgid "Print"
+msgstr "�������������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-minicard.c:672
+#, fuzzy
+msgid "Print Envelope"
+msgstr "�������������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:641
+msgid "* Click here to add a contact *"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:642
+#, fuzzy
+msgid "File As"
+msgstr "_��������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:644
 #, fuzzy
 msgid "Email"
 msgstr "_������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:645
+#, fuzzy
+msgid "Primary Phone"
+msgstr "�������������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:646
+msgid "Assistant Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:647
+msgid "Business Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:648
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:649
+#, fuzzy
+msgid "Company Phone"
+msgstr "���������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:650
+#, fuzzy
+msgid "Home Phone"
+msgstr "������_��"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:651
 msgid "Organization"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/gui/widgets/e-addressbook-view.c:652
+msgid "Business Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:653
+#, fuzzy
+msgid "Home Address"
+msgstr "�������� �������� ���������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:654
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "_������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:658
+msgid "Business Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:659
+#, fuzzy
+msgid "Home Phone 2"
+msgstr "������_��"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:661
+#, fuzzy
+msgid "Other Phone"
+msgstr "������ ������������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:666
+msgid "TTY"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:667
+#, fuzzy
+msgid "Other Address"
+msgstr "���� ��� ��� �� ���������������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:670
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:671
 #, fuzzy
 msgid "Department"
 msgstr "����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/gui/widgets/e-addressbook-view.c:672
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:673
 #, fuzzy
 msgid "Title"
 msgstr "_��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/gui/widgets/e-addressbook-view.c:674
 #, fuzzy
 msgid "Profession"
 msgstr "�_��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/gui/widgets/e-addressbook-view.c:675
 #, fuzzy
 msgid "Manager"
 msgstr "����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:678
 #, fuzzy
 msgid "Spouse"
 msgstr "��� ����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:679
 #, fuzzy
 msgid "Note"
 msgstr "������_��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-minicard-control.c:282
 #, fuzzy
 msgid "Save in addressbook"
 msgstr "���� ��� ��� �� ���������������"
 
-#: addressbook/gui/widgets/e-minicard-view.c:129
+#: addressbook/gui/widgets/e-minicard-view.c:166
 msgid ""
 "\n"
 "\n"
@@ -1115,458 +1326,1336 @@ 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
+msgid "Card View"
+msgstr ""
+
+#: 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 "Evolution Calendar Conduit"
-msgstr "�_����� ������������ ��� Evolution"
+msgid "Body"
+msgstr "������"
 
-#: 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:5
+msgid "Bottom:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
-msgid "Error while communicating with calendar server"
+#: addressbook/printing/e-contact-print.glade.h:6
+#, fuzzy
+msgid "Dimensions:"
+msgstr "�_��������"
+
+#: addressbook/printing/e-contact-print.glade.h:7
+#, fuzzy
+msgid "Font..."
+msgstr "�������������"
+
+#: addressbook/printing/e-contact-print.glade.h:8
+#, fuzzy
+msgid "Fonts"
+msgstr "���������"
+
+#: addressbook/printing/e-contact-print.glade.h:9
+#, fuzzy
+msgid "Footer:"
+msgstr "_��������"
+
+#: addressbook/printing/e-contact-print.glade.h:10
+#, fuzzy
+msgid "Format"
+msgstr "���"
+
+#: addressbook/printing/e-contact-print.glade.h:11
+#, fuzzy
+msgid "Header"
+msgstr "��������"
+
+#: addressbook/printing/e-contact-print.glade.h:12
+msgid "Header/Footer"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
-msgid "Could not read pilot's Calendar application block"
+#: addressbook/printing/e-contact-print.glade.h:13
+msgid "Headings"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:14
+msgid "Headings for each letter"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:15
+msgid "Height:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:16
+msgid "Immediately follow each other"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
+#: 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
+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 ""
+
+#: addressbook/printing/e-contact-print.glade.h:23
 #, fuzzy
-msgid "Evolution ToDo Conduit"
-msgstr "�_����� ������������ ��� Evolution"
+msgid "Options"
+msgstr "�_��������"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
+#: addressbook/printing/e-contact-print.glade.h:24
+msgid "Orientation"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
+#: addressbook/printing/e-contact-print.glade.h:25
+#, fuzzy
+msgid "Page"
+msgstr "����������"
+
+#: addressbook/printing/e-contact-print.glade.h:26
+#, fuzzy
+msgid "Page Setup:"
+msgstr "�������������"
+
+#: addressbook/printing/e-contact-print.glade.h:27
+#, fuzzy
+msgid "Paper"
+msgstr "����������"
+
+#: addressbook/printing/e-contact-print.glade.h:28
+#, fuzzy
+msgid "Paper source:"
+msgstr "������ ������������"
+
+#: addressbook/printing/e-contact-print.glade.h:29
+#, fuzzy
+msgid "Portrait"
+msgstr "�������������"
+
+#: addressbook/printing/e-contact-print.glade.h:30
+msgid "Preview:"
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
+#: 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 ""
 
-#: calendar/gui/alarm-notify.c:876
+#: addressbook/printing/e-contact-print.glade.h:33
+msgid "Right:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:34
 #, fuzzy
-msgid "Snooze"
+msgid "Sections:"
+msgstr "�_��������"
+
+#: addressbook/printing/e-contact-print.glade.h:35
+#, fuzzy
+msgid "Shading"
+msgstr "����������"
+
+#: addressbook/printing/e-contact-print.glade.h:36
+#, fuzzy
+msgid "Size:"
 msgstr "�������"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
+#: addressbook/printing/e-contact-print.glade.h:37
+msgid "Start on a new page"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:38
+#, fuzzy
+msgid "Style name:"
+msgstr "����������� ������"
+
+#: addressbook/printing/e-contact-print.glade.h:39
+#, fuzzy
+msgid "Top:"
+msgstr "����:"
+
+#: addressbook/printing/e-contact-print.glade.h:40
+#, fuzzy
+msgid "Type:"
+msgstr "����:"
+
+#: addressbook/printing/e-contact-print.glade.h:41
+msgid "Width:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:245
+#: calendar/conduits/calendar/calendar-conduit.c:687
+#: calendar/conduits/todo/todo-conduit.c:501
+msgid "Error while communicating with calendar server"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:786
+#: calendar/conduits/calendar/calendar-conduit.c:789
+msgid "Could not read pilot's Calendar application block"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
+msgid "Could not read pilot's ToDo application block"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:266
 msgid "File not found"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:269
+#: calendar/gui/calendar-commands.c:290
 #, fuzzy
 msgid "Open calendar"
 msgstr "�� ���������� ���"
 
-#: calendar/gui/calendar-commands.c:311
+#: calendar/gui/calendar-commands.c:332
 #, fuzzy
 msgid "Save calendar"
 msgstr "�� ���������� ���"
 
-#: calendar/gui/calendar-commands.c:448
+#: calendar/gui/calendar-commands.c:468
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 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"
-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"
-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"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:374
+#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
+#: calendar/gui/e-calendar-table.c:330
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:377
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
+#: calendar/gui/e-calendar-table.c:331
 #, fuzzy
 msgid "Private"
 msgstr "����������"
 
-#: calendar/gui/calendar-model.c:380
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
+#: calendar/gui/e-calendar-table.c:332
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
+#: 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
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:457
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:457
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:459
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:459
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:545
+#: 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
+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
+#, 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
+#, fuzzy
+msgid "Low"
+msgstr "_���"
+
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
+#: calendar/gui/e-calendar-table.c:406
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:548
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
+#: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:774
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
+#: 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
+msgid "Not Started"
 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:638 calendar/gui/calendar-model.c:1175
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:427
+msgid "In Progress"
 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:641 calendar/gui/calendar-model.c:1177
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:428
+msgid "Completed"
 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: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
+msgid "Cancelled"
 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"
+#. 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
+msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
+#. 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
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:799
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:879
+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
+#, fuzzy
+msgid "None"
+msgstr "������_��"
+
+#: calendar/gui/calendar-model.c:967
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1007
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
+#: calendar/gui/calendar-model.c:1048
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:97
+#. 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
+msgid "Undefined"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1102
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1571
+msgid "Recurring"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1573
+msgid "Assigned"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1579
+msgid "Yes"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1579
+#, fuzzy
+msgid "No"
+msgstr "_���"
+
+#: calendar/gui/calendar-summary.c:196
 msgid "%A, %e %B %Y"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
 msgid "%I:%M%p"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:302
+#: calendar/gui/calendar-summary.c:437
 msgid "<b>Error loading calendar</b>"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:314
+#: calendar/gui/calendar-summary.c:449
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:484
+#: calendar/gui/calendar-summary.c:616
 msgid "Display"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:489
+#: calendar/gui/calendar-summary.c:621
 #, fuzzy
 msgid "Show appointments"
 msgstr "�_�������"
 
-#: calendar/gui/calendar-summary.c:497
+#: calendar/gui/calendar-summary.c:629
 #, fuzzy
 msgid "Show tasks"
 msgstr "�������� �������_����"
 
-#: calendar/gui/calendar-summary.c:583
+#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
 #, fuzzy
 msgid "Loading Calendar"
 msgstr "����������"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:126
 #, fuzzy
 msgid "The URI that the calendar will display"
 msgstr "�� URI ��� �� ��������� � ����������� ��������"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+#: 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/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+#, fuzzy
+msgid "Snooze"
+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/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/notify-main.c:67 calendar/gui/main.c:52
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "������ ���/�����: ������������ ��� Bonobo �������"
+
+#: calendar/gui/alarm-notify/notify-main.c:77
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: calendar/gui/dialogs/alarm-notify-dialog.c:189
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
+#: 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-notify-dialog.c:202
+#: calendar/gui/dialogs/alarm-notify-dialog.c:207
 msgid "No summary available."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:63
+#: 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-notify.glade.h:2
+#, fuzzy
+msgid "Edit appointment"
+msgstr "�_�������"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:4
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#, fuzzy
+msgid "05 minutes"
+msgstr "���������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+#, fuzzy
+msgid "10 minutes"
+msgstr "���������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+msgid "12 hour (am/pm)"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+#, fuzzy
+msgid "15 minutes"
+msgstr "���������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+msgid "24 hour"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "30 minutes"
+msgstr "���������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+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
+#, fuzzy
+msgid "Calendar"
+msgstr "����������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#, fuzzy
+msgid "Calendar Preferences"
+msgstr "����������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#, fuzzy
+msgid "Colors"
+msgstr "_��������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Compress weekends"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Date navigator options"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "Defaults"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+msgid "Display options"
+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
+msgid "First day of week:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "Fri"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/event-editor.c:481
+#, 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
+msgid "Mon"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/event-editor.c:477
+#, 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:"
+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
+#, 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
+msgid "Sat"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/event-editor.c:482
+#, 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
+#, fuzzy
+msgid "Show appointment end times"
+msgstr "�_�������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show week numbers"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#, fuzzy
+msgid "Start of day:"
+msgstr "��_���� ����������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Sun"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/event-editor.c:483
+#, fuzzy
+msgid "Sunday"
+msgstr "��������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "TaskPad"
+msgstr "�������_����"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "Thu"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/event-editor.c:480
+#, 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:49
+msgid "Time divisions:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "Time format:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+msgid "Tue"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:478
+#, 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
+msgid "Wed"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: calendar/gui/event-editor.c:479
+msgid "Wednesday"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+msgid "Work week"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+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'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:66
+#: calendar/gui/dialogs/delete-comp.c:73
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:72
+#: calendar/gui/dialogs/delete-comp.c:79
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:75
+#: calendar/gui/dialogs/delete-comp.c:82
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:81
+#: calendar/gui/dialogs/delete-comp.c:88
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:84
+#: calendar/gui/dialogs/delete-comp.c:91
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:690
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+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"
+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:"
+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"
+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:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:28
+msgid "_Confidential"
+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/task-editor-dialog.glade.h:25
+msgid "_Due Date:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#, fuzzy
+msgid "_Priority:"
+msgstr "�������������"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#, fuzzy
+msgid "_Status:"
+msgstr "��������� ��������"
+
+#: calendar/gui/dialogs/task-editor.c:697
 msgid "Edit Task"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "�_�������"
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
 #, fuzzy, c-format
 msgid "Task - %s"
 msgstr "������������"
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "���������� �����_������"
 
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:154
+#: calendar/gui/e-calendar-table.c:157
 msgid "Categories"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:155
-msgid "Classification"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:159
 msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:160
 #, fuzzy
 msgid "End Date"
 msgstr "��_���� ����������"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:161
 #, fuzzy
 msgid "Start Date"
 msgstr "��_���� ����������"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:163
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
+#: calendar/gui/e-calendar-table.c:164
+msgid "Percent complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "�������������"
-
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:166
 #, fuzzy
 msgid "Summary"
 msgstr "��������"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:167
 msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:168
 msgid "URL"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:169
 #, fuzzy
 msgid "Alarms"
 msgstr "����������"
 
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/e-calendar-table.c:170
 #, fuzzy
-msgid "Open..."
-msgstr "����_���"
+msgid "Click here to add a task"
+msgstr "���� ��� ��� �� ���������������"
 
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:384
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:552
 msgid "Mark the task complete"
 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/e-calendar-table.c:557
+msgid "Edit this task..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:558
+#, fuzzy
+msgid "Edit the task"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/e-calendar-table.c:560
+#: ui/evolution-task-editor-dialog.xml.h:19
+#, fuzzy
+msgid "Delete this task"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/e-calendar-table.c:561
 #, fuzzy
 msgid "Delete the task"
 msgstr "�������� �������� ���������"
 
-#: 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 ""
 
 #. 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:274 calendar/gui/e-day-view.c:1294
+#: calendar/gui/e-week-view-main-item.c:325
 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
+#: 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 ""
 
 #. 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:282 calendar/gui/e-day-view.c:1321
+#: 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:570 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:617
 msgid "am"
 msgstr ""
 
 #. 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:573 calendar/gui/e-week-view.c:303
+#: calendar/gui/print.c:616
 msgid "pm"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "New appointment..."
+msgid "New Appointment"
 msgstr "�_�������"
 
-#: 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:3148 calendar/gui/e-week-view.c:3280
+msgid "New All Day Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
+#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
 #, fuzzy
-msgid "Delete this appointment"
+msgid "Go to Today"
+msgstr "������"
+
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#, fuzzy
+msgid "Go to Date..."
+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/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
+#, fuzzy
+msgid "Delete this Appointment"
 msgstr "�������� �������� ���������"
 
-#: 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: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:3021 calendar/gui/e-week-view.c:3224
+#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
 #, fuzzy
-msgid "Delete this occurrence"
+msgid "Make this Occurrence Movable"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
+#, fuzzy
+msgid "Delete this Occurrence"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/e-day-view.c:3179
+#, fuzzy
+msgid "Delete all Occurrences"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/e-itip-control.c:161
+msgid "I couldn't update your calendar file!\n"
+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:173
+msgid "There was an error loading the calendar file."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:197
+msgid "I couldn't open your calendar file!\n"
+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 ""
+
+#: calendar/gui/e-itip-control.c:470
+msgid "I couldn't read your calendar file!\n"
+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:499
+msgid "I couldn't update your calendar store."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:540
+msgid "I couldn't delete the calendar component!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:550
+msgid "Component successfully deleted."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:694
+#, fuzzy
+msgid "I don't recognize this type of calendar component."
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "Add to Calendar"
+msgstr "�� ���������� ���"
+
+#: calendar/gui/e-itip-control.c:814
+msgid " Accept "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:815
+msgid " Decline "
 msgstr ""
 
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
+#: calendar/gui/e-itip-control.c:816
+msgid " Tentative "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:860
+#, fuzzy
+msgid "Update Calendar"
+msgstr "����������"
+
+#: calendar/gui/e-itip-control.c:883
+msgid "Cancel Meeting"
+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 "Calendar Message"
+msgstr "����������"
+
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
+#, fuzzy
+msgid "Date:"
+msgstr "����������"
+
+#: calendar/gui/e-itip-control.glade.h:8
+#, fuzzy
+msgid "Loading calendar..."
+msgstr "����������"
+
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:10
+#, fuzzy
+msgid "Server Message:"
+msgstr "����������� ��������"
+
+#: calendar/gui/e-itip-control.glade.h:11
+#, fuzzy
+msgid "Summary:"
+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-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 ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:7
+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
+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
+msgid ""
+"Request\n"
+"Meeting"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:20
+msgid "Required Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:21
+#, fuzzy
+msgid "Role"
+msgstr "_������"
+
+#: calendar/gui/e-meeting-dialog.glade.h:22
+msgid ""
+"Schedule\n"
+"Time"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
+#: mail/message-list.c:1052
+#, fuzzy
+msgid "Status"
+msgstr "��������� ��������"
+
+#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
+#: calendar/gui/e-tasks.c:502
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:146
+#: calendar/gui/e-tasks.c:155
 msgid "Category:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:285
+#: calendar/gui/e-tasks.c:298
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "�������� ���� ���������"
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:310
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
@@ -1574,574 +2663,1216 @@ 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
+#: calendar/gui/e-week-view-main-item.c:342
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/event-editor.c:331
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
 #, fuzzy
-msgid "Edit Appointment"
+msgid "New Appointment..."
 msgstr "�_�������"
 
-#: calendar/gui/event-editor.c:409
+#: calendar/gui/e-week-view.c:3314
 #, fuzzy
-msgid "on"
-msgstr "����"
+msgid "Delete All Occurrences"
+msgstr "�������� �������� ���������"
 
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
+#: calendar/gui/event-editor-dialog.glade.h:1
+msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/event-editor.c:435
+#: calendar/gui/event-editor-dialog.glade.h:3
 #, fuzzy
-msgid "Monday"
-msgstr "������"
+msgid "Appointment"
+msgstr "�_�������"
 
-#: calendar/gui/event-editor.c:436
+#: calendar/gui/event-editor-dialog.glade.h:4
 #, fuzzy
-msgid "Tuesday"
-msgstr "������"
+msgid "Appointment Basics"
+msgstr "�_�������"
 
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
+#: 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.c:438
+#: calendar/gui/event-editor-dialog.glade.h:11
 #, fuzzy
-msgid "Thursday"
+msgid "Exceptions"
+msgstr "�_��������"
+
+#: calendar/gui/event-editor-dialog.glade.h:12
+#, fuzzy
+msgid "Modify"
 msgstr "������"
 
-#: calendar/gui/event-editor.c:439
+#: calendar/gui/event-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Friday"
-msgstr "�������������"
+msgid "No recurrence"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:1579
+msgid "Play a sound"
+msgstr ""
 
-#: calendar/gui/event-editor.c:440
+#: calendar/gui/event-editor-dialog.glade.h:15
+msgid "Preview"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:18
 #, fuzzy
-msgid "Saturday"
+msgid "Recurrence"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/event-editor-dialog.glade.h:19
+#, fuzzy
+msgid "Recurrence Rule"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/event-editor-dialog.glade.h:20
+#, fuzzy
+msgid "Reminder"
 msgstr "��������"
 
-#: calendar/gui/event-editor.c:441
+#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:1588
+msgid "Run a program"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor.c:1585
 #, fuzzy
-msgid "Sunday"
+msgid "Send an email"
 msgstr "��������"
 
-#: calendar/gui/event-editor.c:561
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Settings..."
+msgstr "�_��������"
+
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor.c:1582
+msgid "Show a dialog"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:26
+msgid "Simple recurrence"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:30
+#, fuzzy
+msgid "_End time:"
+msgstr "��_���� ����������"
+
+#: calendar/gui/event-editor-dialog.glade.h:31
+#, fuzzy
+msgid "_Start time:"
+msgstr "��_���� ����������"
+
+#: calendar/gui/event-editor-dialog.glade.h:32
+#, fuzzy
+msgid "_Starting date:"
+msgstr "��_���� ����������"
+
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
+#, fuzzy
+msgid "after"
+msgstr "����������"
+
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
+msgid "before"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:35
+#, fuzzy
+msgid "day(s)"
+msgstr "��������"
+
+#: calendar/gui/event-editor-dialog.glade.h:36
+#, fuzzy
+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 mail/mail-config.glade.h:77
+#, fuzzy
+msgid "minute(s)"
+msgstr "���������"
+
+#: calendar/gui/event-editor-dialog.glade.h:41
+#, fuzzy
+msgid "month(s)"
+msgstr "���������"
+
+#: calendar/gui/event-editor-dialog.glade.h:42
+#, fuzzy
+msgid "start of appointment"
+msgstr "�_�������"
+
+#: calendar/gui/event-editor-dialog.glade.h:43
+msgid "until"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:44
+msgid "week(s)"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:45
+msgid "year(s)"
+msgstr ""
+
+#: calendar/gui/event-editor.c:373
+#, fuzzy
+msgid "Edit Appointment"
+msgstr "�_�������"
+
+#: calendar/gui/event-editor.c:451
+#, fuzzy
+msgid "on"
+msgstr "����"
+
+#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
+msgid "day"
+msgstr ""
+
+#: calendar/gui/event-editor.c:603
 #, fuzzy
 msgid "on the"
 msgstr "���������"
 
-#: calendar/gui/event-editor.c:568
+#: calendar/gui/event-editor.c:610
 msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:756
 #, fuzzy
 msgid "occurrences"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:873
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
+#: calendar/gui/event-editor.c:1534
+#, fuzzy, c-format
+msgid " %d days"
+msgstr "��������"
+
+#: calendar/gui/event-editor.c:1536
+#, fuzzy
+msgid " 1 day"
+msgstr "��������"
+
+#: calendar/gui/event-editor.c:1539
+#, c-format
+msgid " %d weeks"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1541
+msgid " 1 week"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1544
+#, c-format
+msgid " %d hours"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1546
+msgid " 1 hour"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1549
+#, fuzzy, c-format
+msgid " %d minutes"
+msgstr "���������"
+
+#: calendar/gui/event-editor.c:1551
+#, fuzzy
+msgid " 1 minute"
+msgstr "���������"
+
+#: calendar/gui/event-editor.c:1554
+#, fuzzy, c-format
+msgid " %d seconds"
+msgstr "��������"
+
+#: calendar/gui/event-editor.c:1556
+#, fuzzy
+msgid " 1 second"
+msgstr "��������"
+
+#: calendar/gui/event-editor.c:1603
+#, fuzzy
+msgid " before start of appointment"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/event-editor.c:1605
+#, fuzzy
+msgid " after start of appointment"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/event-editor.c:1613
+#, fuzzy
+msgid " before end of appointment"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/event-editor.c:1615
+#, fuzzy
+msgid " after end of appointment"
+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"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:696
+#: 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 "������������� ��� ���������� ������� Bonobo ����������"
+
+#: 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 "������������� ��� ���������� ������� 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-cal.c:700
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: calendar/gui/gnome-cal.c:707
+#: calendar/gui/gnome-cal.c:711
 #, 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"
+#: calendar/gui/goto-dialog.glade.h:1
+#, fuzzy
+msgid "April"
+msgstr "����������"
+
+#: calendar/gui/goto-dialog.glade.h:2
+msgid "August"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
+#: calendar/gui/goto-dialog.glade.h:3
+msgid "December"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
+#: calendar/gui/goto-dialog.glade.h:4
+msgid "February"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
+#: calendar/gui/goto-dialog.glade.h:5
+#, fuzzy
+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/gnome-month-item.c:740
-msgid "Thu"
+#: calendar/gui/goto-dialog.glade.h:8
+msgid "July"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
+#: calendar/gui/goto-dialog.glade.h:9
+msgid "June"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
+#: calendar/gui/goto-dialog.glade.h:10
+msgid "March"
 msgstr ""
 
-#: calendar/gui/main.c:50
+#: calendar/gui/goto-dialog.glade.h:11
 #, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "������ ���/�����: ������������ ��� Bonobo �������"
+msgid "May"
+msgstr "������"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/goto-dialog.glade.h:12
+msgid "November"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:13
+msgid "October"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:14
+msgid "September"
+msgstr ""
+
+#: calendar/gui/print.c:300
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:300
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:300
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:300
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:300
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:301
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:301
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:301
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:301
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:301
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:302
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:302
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:302
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:302
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:302
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:303
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:303
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:303
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:303
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:303
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:304
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:304
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:304
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:304
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:304
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:305
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:305
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:305
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:305
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:305
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:306
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 #, fuzzy
 msgid "Fr"
 msgstr "���"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "Sa"
 msgstr ""
 
-#: calendar/gui/print.c:941
+#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
 #, fuzzy
 msgid "Tasks"
 msgstr "�������_����"
 
 #. Day
-#: calendar/gui/print.c:1071
+#: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1086
+#: calendar/gui/print.c:1093
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1097
+#: calendar/gui/print.c:1104
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1105
+#: calendar/gui/print.c:1112
 msgid "Current month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1112
+#: calendar/gui/print.c:1119
 msgid "Current year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1149
+#: calendar/gui/print.c:1156
 #, fuzzy
 msgid "Print Calendar"
 msgstr "����������"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
+#: 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
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/tasks-control.c:108
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "�� URI ��� �� ��������� � ����������� ��������"
 
-#: 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:169
+msgid "Signing is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:207
+msgid "Clearsigning is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:245
+msgid "Verifying is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:286
+msgid "Encryption is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:326
+msgid "Decryption is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#, fuzzy
+msgid "Syncing folders"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: camel/camel-filter-driver.c:643
+#, fuzzy
+msgid "Unable to open spool folder"
+msgstr "���� ��� ��� �� ���������������"
+
+#: camel/camel-filter-driver.c:652
+#, fuzzy
+msgid "Unable to process spool folder"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: camel/camel-filter-driver.c:666
+#, fuzzy
+msgid "Getting message %d (%d%%)"
+msgstr "��� ��������"
+
+#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#, fuzzy, c-format
+msgid "Failed message %d"
+msgstr "�������� �������� ���������"
+
+#: camel/camel-filter-driver.c:671
+#, fuzzy
+msgid "Cannot open message"
+msgstr "����������� ��������"
+
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#, 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
+#, fuzzy, c-format
+msgid "Getting message %d of %d"
+msgstr "��� ��������"
+
+#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#, fuzzy, c-format
+msgid "Failed at message %d of %d"
+msgstr "�������� �������� ���������"
+
+#: camel/camel-filter-driver.c:866
+#, fuzzy, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr "�������� �������� ���������"
+
+#: camel/camel-filter-driver.c:871
+#, fuzzy, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#, fuzzy, c-format
+msgid "Error executing filter search: %s: %s"
+msgstr "�������� �������� ���������"
+
+#: camel/camel-folder-search.c:328
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-folder-search.c:338
+#, fuzzy, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr "�������� �������� ���������"
+
+#: 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 ""
+
 #. 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 camel/camel-movemail.c:138
+#: camel/camel-movemail.c:185
 #, fuzzy, 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 camel/camel-movemail.c:219
 #, 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:101
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:148
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:197
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:243
+#: camel/camel-movemail.c:245
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:254
+#: camel/camel-movemail.c:256
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:274
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:304
+#: camel/camel-movemail.c:306
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:318
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:356
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:357
 msgid "(Unknown error)"
 msgstr ""
 
-#: camel/camel-provider.c:133
+#: camel/camel-movemail.c:587
+#, c-format
+msgid "Error copying mail temp file: %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:186
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:189
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr ""
+
+#: camel/camel-pgp-context.c:509
+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
+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
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:681
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:871
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:888
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: camel/camel-pgp-context.c:1011
+msgid "No plaintext to encrypt."
+msgstr ""
+
+#: camel/camel-pgp-context.c:1037
+msgid "No recipients specified"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1227
+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:186
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:188
+#: camel/camel-remote-store.c:190
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:318
+#: camel/camel-remote-store.c:240
 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:243
+#: camel/providers/smtp/camel-smtp-transport.c:261
 #, 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:244
 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:325 camel/camel-remote-store.c:387
+#: camel/camel-remote-store.c:458
+#: camel/providers/imap/camel-imap-command.c:264
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "�� ���������� ���"
 
-#: camel/camel-service.c:137
+#: camel/camel-remote-store.c:464
+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
+msgid "Authentication failed."
+msgstr ""
+
+#: 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:417
+msgid "Bad authentication response from server."
+msgstr ""
+
+#: 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
+#, c-format
+msgid "Regular expression compilation failed: %s: %s"
+msgstr ""
+
+#: camel/camel-service.c:152
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:146
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:168
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:520
+#: camel/camel-service.c:554
 #, c-format
-msgid "No such host %s."
+msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:523
+#: camel/camel-service.c:581
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
+msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-session.c:299
+#: camel/camel-service.c:606
 #, c-format
-msgid "No provider available for protocol `%s'"
+msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-session.c:390
+#: camel/camel-service.c:608
 #, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
+msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
+#: camel/camel-session.c:57
+msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
+#: camel/camel-session.c:59
+msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-url.c:150
+#: camel/camel-session.c:274 camel/camel-session.c:364
 #, c-format
-msgid "Port number in URL `%s' is non-numeric"
+msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:133
+#: camel/camel-session.c:462
 #, c-format
 msgid ""
-"Could not get Kerberos ticket:\n"
+"Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-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
+#, fuzzy
+msgid "Trash"
+msgstr "�������_����"
+
+#: camel/camel-url.c:289
+#, fuzzy, c-format
+msgid "Could not parse URL `%s'"
+msgstr "�������� ���� ���������"
+
+#: camel/camel-vee-folder.c:451
+#, fuzzy, c-format
+msgid "No such message %s in %s"
+msgstr "�������� ��� ���������"
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/camel-vee-folder.c:545
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "�������� ��� ���������"
+
+#: camel/providers/imap/camel-imap-command.c:209
 #, 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:217
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:272
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:433
+#: camel/providers/imap/camel-imap-command.c:456
 #, 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:490
 #, 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:172
 #, 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:351
+#, fuzzy
+msgid "Scanning IMAP folder"
+msgstr "���������� ��� �������..."
+
+#: camel/providers/imap/camel-imap-folder.c:986
+#: camel/providers/imap/camel-imap-folder.c:1197
+msgid "This message is not currently available"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1016
+#: camel/providers/imap/camel-imap-folder.c:1231
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:39
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+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:484
+#, fuzzy
+msgid "Folders"
+msgstr "_��������"
+
+#: 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 "������"
+
+#: 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:440
+#, 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."
+#: camel/providers/imap/camel-imap-store.c:450
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, c-format
+msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:361
+#: camel/providers/imap/camel-imap-store.c:475
 #, 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:490
+#: camel/providers/smtp/camel-smtp-transport.c:403
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:518
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2149,303 +3880,321 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:645
+#: camel/providers/imap/camel-imap-store.c:865
+#, 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 ""
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/imap/camel-imap-store.c:1382
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:39
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:40
 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:49
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:50
 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:59
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:122
+#: camel/providers/local/camel-local-store.c:129
 #, 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:136
 #, 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:144
+#: camel/providers/local/camel-local-store.c:160
 #, fuzzy, 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"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
+#: camel/providers/local/camel-local-store.c:175
+msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:200
+#: camel/providers/local/camel-local-store.c:185
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:256
+#: camel/providers/local/camel-local-store.c:241
 #, 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:283
 #, 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:293
 #, 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-maildir-folder.c:150
+#: camel/providers/local/camel-maildir-folder.c:158
+#: camel/providers/local/camel-maildir-folder.c:169
 #, 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: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
 #, 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:197
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
 #, fuzzy
 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:218
+#: camel/providers/local/camel-mh-folder.c:203
 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:96
+#: 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:100
+#: 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:107
+#: camel/providers/local/camel-mh-store.c:103
 #, fuzzy, 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:122
 #, 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:151
+#: camel/providers/local/camel-maildir-store.c:188
+#: 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:152
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:152
+#, fuzzy, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: camel/providers/local/camel-mbox-folder.c:203
 #, 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:335
+#: camel/providers/local/camel-mbox-folder.c:367
+#: camel/providers/local/camel-mbox-folder.c:380
 #, fuzzy, 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:368
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:381
 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:248
+#, fuzzy
+msgid "Summarising folder"
+msgstr "_���� ��������"
+
+#: camel/providers/local/camel-mbox-summary.c:253
 #, 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:295
 #, 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:370
 #, 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:501
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+msgid "Synchronising folder"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:506
+#: camel/providers/local/camel-mbox-summary.c:707
 #, 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:523
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: 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: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
 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:599
 #, 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:616
 #, 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:634
+#: camel/providers/local/camel-mbox-summary.c:803
 #, 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:643
 #, fuzzy, 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:654
 #, 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
 #, 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:149
+#: camel/providers/local/camel-mh-folder.c:157
 #, fuzzy, 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/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:66
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:72
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:81
 msgid "Server rejected username/password"
 msgstr ""
 
@@ -2469,11 +4218,11 @@ msgstr ""
 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 ""
 
@@ -2499,358 +4248,536 @@ msgstr ""
 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 "����������� ��������"
+
+#: camel/providers/pop3/camel-pop3-folder.c:192
 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:285
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:288
+#: camel/providers/pop3/camel-pop3-folder.c:289
+#, fuzzy, c-format
+msgid "Retrieving POP message %d"
+msgstr "��� ��������"
+
+#: camel/providers/pop3/camel-pop3-folder.c:307
 #, 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:42
 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:207
 #, 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:319
 #, 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:358
 #, 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:377
 #, 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:380
+#: camel/providers/pop3/camel-pop3-store.c:417
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:424
+#: camel/providers/pop3/camel-pop3-store.c:407
 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:415
 #, 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:483
 #, 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:57
 #, fuzzy
 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
 #, fuzzy, c-format
 msgid "Could not send message: %s"
 msgstr "�������� ���� ���������"
 
-#: 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 "�������� ���� ���������"
+
+#: 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:52
+msgid "SMTP"
+msgstr ""
+
+#: 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:165
+msgid "Syntax error, command unrecognized"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:167
+msgid "Syntax error in parameters or arguments"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Command not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:171
+msgid "Command parameter not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:173
+msgid "System status, or system help reply"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:175
+#, fuzzy
+msgid "Help message"
+msgstr "����������� ��������"
+
+#: camel/providers/smtp/camel-smtp-transport.c:177
+#, fuzzy
+msgid "Service ready"
+msgstr "��������"
+
+#: camel/providers/smtp/camel-smtp-transport.c:179
+msgid "Service closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:181
+msgid "Service not available, closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:183
+msgid "Requested mail action okay, completed"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:185
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
+msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:279
-msgid "No authentication required"
+#: camel/providers/smtp/camel-smtp-transport.c:187
+msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: 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:189
+msgid "Requested action not taken: mailbox unavailable"
 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:191
+msgid "Requested action aborted: error in processing"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:193
+msgid "User not local; please try <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:195
+msgid "Requested action not taken: insufficient system storage"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:197
+msgid "Requested mail action aborted: exceeded storage allocation"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:199
+msgid "Requested action not taken: mailbox name not allowed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:201
+msgid "Start mail input; end with <CRLF>.<CRLF>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:203
+msgid "Transaction failed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:207
+msgid "A password transition is needed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:209
+msgid "Authentication mechanism is too weak"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:211
+msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
+#: camel/providers/smtp/camel-smtp-transport.c:213
+msgid "Temporary authentication failure"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:215
+msgid "Authentication required"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:305
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:348
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:388
+#, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:411
+#, 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:527
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:322
+#: camel/providers/smtp/camel-smtp-transport.c:529
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:347
+#: camel/providers/smtp/camel-smtp-transport.c:554
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:561
 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
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:462
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, 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:688
 #, 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:721
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:736
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, c-format
+msgid "AUTH request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:798
+msgid "Bad authentication response from server.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:824
 #, 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:843
 #, 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:868
 #, 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:887
+#, 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:918
 #, 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:937
 #, 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:952
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:989
 #, 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:1013
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:709
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:732
+#: camel/providers/smtp/camel-smtp-transport.c:1055
 #, 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:1074
 #, 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:95
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:97
 #, c-format
 msgid "%u bytes"
 msgstr "%u byte"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:112
 #, 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:332 mail/mail-display.c:120
 #, fuzzy
 msgid "attachment"
 msgstr "��� ���������"
 
-#: composer/e-msg-composer-attachment-bar.c:413
+#: 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:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "��������"
-
-#: composer/e-msg-composer-attachment-bar.c:461
+#: composer/e-msg-composer-attachment-bar.c:469
 msgid "Remove selected items from the attachment list"
 msgstr "�������� ����������� ������������ ��� ��� �������� �����������"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Add attachment..."
 msgstr "��� ���������..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:501
 msgid "Attach a file to the message"
 msgstr "��������� ������� ��� ������"
 
-#: 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 mail/message-list.c:1052
 #, fuzzy
-msgid "From:"
-msgstr "���"
+msgid "Attachment"
+msgstr "��� ���������"
+
+#: composer/e-msg-composer-attachment.glade.h:2
+#, fuzzy
+msgid "Attachment properties"
+msgstr "���������"
+
+#: composer/e-msg-composer-attachment.glade.h:4
+#, fuzzy
+msgid "File name:"
+msgstr "����������� ������"
+
+#: composer/e-msg-composer-attachment.glade.h:5
+#, fuzzy
+msgid "Inline attachment"
+msgstr "��� ���������"
 
-#: composer/e-msg-composer-hdrs.c:257
+#: composer/e-msg-composer-attachment.glade.h:6
+msgid "MIME type:"
+msgstr ""
+
+#: composer/e-msg-composer-attachment.glade.h:7
+#, fuzzy
+msgid "Send as:"
+msgstr "�_��������"
+
+#: composer/e-msg-composer-hdrs.c:321
 msgid "Click here for the address book"
 msgstr "���� ��� ��� �� ���������������"
 
-#: composer/e-msg-composer-hdrs.c:313
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
 #, fuzzy
-msgid "Enter the identity you wish to send this message from"
-msgstr "�������� ��� ��������� ��� ���������"
+msgid "From:"
+msgstr "���"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
+msgid "Reply-To:"
+msgstr ""
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
+msgid "Subject:"
+msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
 msgid "To:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:318
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Enter the recipients of the message"
 msgstr "�������� ��� ��������� ��� ���������"
 
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
 msgid "Cc:"
 msgstr "���������:"
 
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:388
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�������� ��� ����������� ���� �� ������ ��������� ��� ���������"
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Bcc:"
 msgstr "����� ���������:"
 
-#: composer/e-msg-composer-hdrs.c:329
+#: composer/e-msg-composer-hdrs.c:392
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -2858,185 +4785,419 @@ msgstr ""
 "�������� ��� ����������� ���� �� ������ ��������� ��� ��������� ����� ����� "
 "�� ����������� ���� �������� ���������� ��� ���������."
 
-#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "����:"
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr "�������� �� ���� ��� ���������"
-
-#: composer/e-msg-composer.c:430
+#: composer/e-msg-composer.c:528
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:598
+#: composer/e-msg-composer.c:716
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:609
+#: composer/e-msg-composer.c:727
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:629
+#: composer/e-msg-composer.c:747
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:651
-#, fuzzy
-msgid "Saving changes to message..."
-msgstr "�������� ��� ���������"
-
-#: composer/e-msg-composer.c:653
-#, fuzzy
-msgid "Save changes to message..."
-msgstr "�������� ��� ���������"
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
+#: composer/e-msg-composer.c:819
+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:752 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:877 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:206
 msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:758
+#: composer/e-msg-composer.c:883
 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:908
 #, fuzzy
 msgid "Open file"
 msgstr "������� ��������"
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:1034
 msgid "That file does not exist."
 msgstr ""
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:1044
 msgid "That is not a regular file."
 msgstr ""
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:1054
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:939
+#: composer/e-msg-composer.c:1064
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:961
+#: 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:982
+#: composer/e-msg-composer.c:1107
 msgid "An error occurred while reading the file."
 msgstr ""
 
-#: composer/e-msg-composer.c:1362
+#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
 #, fuzzy
 msgid "Compose a message"
 msgstr "�������� ���� ���������"
 
-#: composer/e-msg-composer.c:1439
+#: composer/e-msg-composer.c:1829
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:346
+#: 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 "������������� ��� ���������� ������� Bonobo ����������"
 
-#: filter/filter-datespec.c:62
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "The Evolution groupware suite"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: data/evolution.keys.in.h:1
+msgid "address card"
+msgstr ""
+
+#: data/evolution.keys.in.h:2
+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:1282 widgets/misc/e-dateedit.c:1463
+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"
+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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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:2503
+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
+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
+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
 msgid "year"
 msgstr ""
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "years"
 msgstr ""
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 #, fuzzy
 msgid "month"
 msgstr "���������"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 #, fuzzy
 msgid "months"
 msgstr "���������"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "week"
 msgstr ""
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "weeks"
 msgstr ""
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:81
 #, fuzzy
 msgid "days"
 msgstr "��������"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hour"
 msgstr ""
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hours"
 msgstr ""
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:83
 msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr ""
-
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 #, fuzzy
 msgid "second"
 msgstr "��������"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 #, fuzzy
 msgid "seconds"
 msgstr "��������"
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:199
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:201
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:275
 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:298
 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:338
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -3044,155 +5205,150 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:374
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:432
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
 msgid "now"
 msgstr ""
 
-#: filter/filter-datespec.c:690
+#: filter/filter-datespec.c:706
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-#, fuzzy
-msgid "Add Filter Rule"
-msgstr "_��������"
-
-#: filter/filter-editor.c:233
-#, fuzzy
-msgid "Edit Filter Rule"
-msgstr "_��������"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr ""
-
-#: filter/filter-editor.c:456
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
 #, fuzzy
-msgid "Edit Filters"
+msgid "Filter Rules"
 msgstr "_��������"
 
 #. and now for the action area
-#: filter/filter-filter.c:401
+#: filter/filter-filter.c:453
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:414
+#: filter/filter-filter.c:467
 #, fuzzy
 msgid "Add action"
 msgstr "�_��������"
 
-#: filter/filter-filter.c:420
-#, fuzzy
-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."
 msgstr ""
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
+#: mail/mail-account-gui.c:682
 #, fuzzy
 msgid "Select Folder"
 msgstr "_���� ��������"
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:247
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:293
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:185
+#: filter/filter-input.c:194
 #, 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:475
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:626
 #, fuzzy
 msgid "Rule name: "
 msgstr "����������� ������"
 
-#: filter/filter-rule.c:534
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:646
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:664
 #, fuzzy
 msgid "Execute actions"
 msgstr "�_��������"
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:668
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:673
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:587
+#: filter/filter-rule.c:684
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:593
+#: filter/filter.glade.h:4
 #, fuzzy
-msgid "Remove criterion"
-msgstr "�������� ������"
+msgid "Edit Filters"
+msgstr "_��������"
 
-#: filter/filter-system-flag.c:63
-msgid "Replied to"
+#: filter/filter.glade.h:5
+#, fuzzy
+msgid "Edit VFolders"
+msgstr "_��������"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
 msgstr ""
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
+#: filter/filter.glade.h:8
+msgid "Outgoing"
 msgstr ""
 
-#: filter/filter-system-flag.c:67
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 #, fuzzy
-msgid "Read"
-msgstr "��������"
+msgid "Virtual Folders"
+msgstr "_��������"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr ""
+
+#: filter/filter.glade.h:12
+#, fuzzy
+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 ""
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
@@ -3205,386 +5361,484 @@ msgstr ""
 
 #: filter/libfilter-i18n.h:4
 #, fuzzy
+msgid "Attachments"
+msgstr "��� ���������"
+
+#: filter/libfilter-i18n.h:5
+#, fuzzy
 msgid "Copy to Folder"
 msgstr "���������� ��� �������..."
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
 #, fuzzy
 msgid "Date received"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:7
 #, fuzzy
 msgid "Date sent"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
+msgid "Deleted"
+msgstr ""
+
+#: filter/libfilter-i18n.h:10
+msgid "Do Not Exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Draft"
+msgstr "����������"
+
+#: filter/libfilter-i18n.h:12
+msgid "Exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:13
 #, fuzzy
 msgid "Expression"
 msgstr "�_��������"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:14
 #, fuzzy
 msgid "Forward to Address"
 msgstr "�������� �������� ���������"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:15
+msgid "Important"
+msgstr ""
+
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "Is Not"
+msgstr "������_��"
+
+#: filter/libfilter-i18n.h:17
+msgid "Is"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
+msgid "Mailing list"
+msgstr ""
+
+#: filter/libfilter-i18n.h:19
 #, fuzzy
 msgid "Message Body"
 msgstr "��������� ���������"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:20
 #, fuzzy
 msgid "Message Header"
 msgstr "��������� ���������"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:21
 msgid "Message was received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
 #, fuzzy
 msgid "Message was sent"
 msgstr "��������� ���������"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Move to Folder"
 msgstr "���������� ��� �������..."
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:24
+#, fuzzy
+msgid "Read"
+msgstr "��������"
+
+#: filter/libfilter-i18n.h:25
 msgid "Recipients"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:26
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
+#: filter/libfilter-i18n.h:27
+msgid "Replied to"
+msgstr ""
+
+#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
+#: mail/message-list.c:1052
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "Sender"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "Set Status"
 msgstr "��������� ��������"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:31
 #, fuzzy
-msgid "Source"
-msgstr "��� ����������"
+msgid "Source Account"
+msgstr "����� ���������"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:32
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-#, fuzzy
-msgid "Status"
-msgstr "��������� ��������"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:34
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
 msgid "Subject"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:25
-#, fuzzy
-msgid "after"
-msgstr "����������"
-
-#: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:38
 #, fuzzy
 msgid "contains"
 msgstr "�_��������"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:39
 msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:40
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:41
 msgid "does not exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:42
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:43
 msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:44
 msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:45
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:46
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:47
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:48
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:49
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:50
 msgid "on or after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:51
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:52
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:54
 msgid "was after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:55
 msgid "was before"
 msgstr ""
 
-#: filter/score-editor.c:127
+#: filter/score-editor.c:130
 #, fuzzy
-msgid "Add Rule"
-msgstr "��� ����������"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:204
-#, fuzzy
-msgid "Edit VFolder Rule"
+msgid "Score Rules"
 msgstr "_��������"
 
-#: mail/component-factory.c:284
+#: mail/component-factory.c:329
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: mail/component-factory.c:320
+#: mail/component-factory.c:402
 msgid "Cannot register storage with shell"
 msgstr ""
 
+#: mail/folder-browser-factory.c:209
+#, 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
+#, fuzzy
+msgid "Properties"
+msgstr "���������"
+
 #: mail/folder-browser.c:225
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "_���� ��������"
 
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr ""
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr ""
-
-#: mail/folder-browser.c:240
-#, fuzzy
-msgid "Subject contains"
-msgstr "����"
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
-msgstr ""
-
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr ""
-
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:533
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:646
+#: mail/folder-browser.c:536
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:539
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:542 mail/folder-browser.c:733
+#, fuzzy
+msgid "VFolder on Mailing List"
+msgstr "�������� ��� �������� ��������"
+
+#: mail/folder-browser.c:548
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:650
+#: mail/folder-browser.c:551
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:651
+#: mail/folder-browser.c:554
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
+#: mail/folder-browser.c:557 mail/folder-browser.c:732
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:658
+#: mail/folder-browser.c:568
 #, fuzzy
-msgid "Open"
-msgstr "����_���"
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr ""
+msgid "Resend"
+msgstr "��������"
 
-#: mail/folder-browser.c:660
+#: mail/folder-browser.c:570
 msgid "Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-#, fuzzy
-msgid "Print"
-msgstr "�������������"
-
-#: mail/folder-browser.c:663
+#: mail/folder-browser.c:577
 msgid "Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:664 mail/mail-view.c:141
+#: 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:665 mail/mail-view.c:144
+#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
 msgid "Forward"
 msgstr ""
 
-#: mail/folder-browser.c:666
+#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
 msgid "Forward inline"
 msgstr ""
 
-#: mail/folder-browser.c:668
+#: mail/folder-browser.c:586
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:669
+#: mail/folder-browser.c:588
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:593
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "���������� ��� �������..."
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:595
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "���������� ��� �������..."
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
 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:678
+#. { _("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
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_��������"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:613
 #, fuzzy
 msgid "Create Rule From Message"
 msgstr "�������� ��������"
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:735
 #, 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
+#: mail/folder-browser.c:736
+#, 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
 #, fuzzy
-msgid "None"
-msgstr "������_��"
+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/mail-accounts.c:115
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Mail Summary component."
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Current store format:"
+msgstr "������ ���/�����: ������������ ��� Bonobo �������"
+
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "���"
+
+#: mail/local-config.glade.h:3
+#, fuzzy
+msgid "New store format:"
+msgstr "������ ���/�����: ������������ ��� Bonobo �������"
+
+#: 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"
+"recoverable.  Please use this feature with care."
+msgstr ""
+
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "maildir"
+msgstr "_������"
+
+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "mbox"
+msgstr "�����������"
+
+#: mail/local-config.glade.h:9
+msgid "mh"
+msgstr ""
+
+#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
 msgid " (default)"
 msgstr ""
 
+#: mail/mail-accounts.c:197
+msgid "Disable"
+msgstr ""
+
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+msgid "Enable"
+msgstr ""
+
+#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+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 ""
+
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
+#: mail/mail-accounts.c:536
 msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/mail-account-editor.c:274
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
+#: 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:634
+#: mail/mail-account-editor.c:173
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "�_����� ������������ ��� Evolution"
 
-#: mail/mail-autofilter.c:71
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, fuzzy, 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: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:357
+#, fuzzy
+msgid "Add Filter Rule"
+msgstr "_��������"
+
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3592,784 +5846,1087 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:136
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:223
+#: mail/mail-callbacks.c:202
 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:235
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:345
+#: mail/mail-callbacks.c:308
+msgid "You must specify recipients in order to send this message."
+msgstr ""
+
+#: mail/mail-callbacks.c:351
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:365
-msgid "You must specify recipients in order to send this message."
+#: mail/mail-callbacks.c:591
+#, c-format
+msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:594
+#: mail/mail-callbacks.c:773
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "�������� �������� ���������"
 
-#: mail/mail-callbacks.c:675
+#: mail/mail-callbacks.c:876
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "��� ��������"
 
-#: mail/mail-callbacks.c:677
+#: mail/mail-callbacks.c:878
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "��� ��������"
 
-#: mail/mail-callbacks.c:812
+#: mail/mail-callbacks.c:1019
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
+#: mail/mail-callbacks.c:1056
+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?"
 msgstr ""
 
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
+#: 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:893
+#: mail/mail-callbacks.c:1137
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:895
+#: mail/mail-callbacks.c:1139
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:979
+#: mail/mail-callbacks.c:1253
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1028
+#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
 #, fuzzy
 msgid "Print Message"
 msgstr "����������� ��������"
 
-#: mail/mail-callbacks.c:1075
+#: mail/mail-callbacks.c:1349
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-config-druid.c:363
-#, c-format
+#: mail/mail-config.c:1043 mail/mail-config.c:1046
+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:3
+#, fuzzy
+msgid "Account"
+msgstr "����� ���������"
+
+#: mail/mail-config.glade.h:4
+#, fuzzy
+msgid "Account Information"
+msgstr "���������"
+
+#: mail/mail-config.glade.h:5
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "Accounts"
+msgstr "����� ���������"
+
+#: mail/mail-config.glade.h:8
+msgid "Authentication"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
+msgid "Authentication Type: "
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Automatically check for new mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:12
 msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+"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-config-druid.c:629
-#, c-format
+#: mail/mail-config.glade.h:18
+msgid "De_fault"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Done"
+msgstr "������_��"
+
+#: mail/mail-config.glade.h:21
+#, fuzzy
+msgid "Drafts"
+msgstr "����������"
+
+#: mail/mail-config.glade.h:22
+#, fuzzy
+msgid "Drafts folder:"
+msgstr "���������� ��� �������..."
+
+#: mail/mail-config.glade.h:24
+#, fuzzy
+msgid "Email Address:"
+msgstr "���� ��� ��� �� ���������������"
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Full Name:"
+msgstr "����������� ������"
+
+#: mail/mail-config.glade.h:27
+msgid "Highlight citations with "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "IMAPv4 "
+msgstr ""
+
+#: mail/mail-config.glade.h:30
+msgid "Identity"
+msgstr ""
+
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Kerberos "
+msgstr "��������"
+
+#: mail/mail-config.glade.h:32
+#, fuzzy
+msgid "Mail Configuration"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: mail/mail-config.glade.h:33
+msgid "Make this my default account"
+msgstr ""
+
+#: mail/mail-config.glade.h:34
+#, fuzzy
+msgid "Mark messages as \"Read\" after:"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "News"
+msgstr "_���"
+
+#: mail/mail-config.glade.h:38
+#, fuzzy
+msgid "Optional Information"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: mail/mail-config.glade.h:39
+msgid "Organization:"
+msgstr ""
+
+#: mail/mail-config.glade.h:41
+msgid "PGP binary path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:46
+msgid "Qmail maildir "
+msgstr ""
+
+#: mail/mail-config.glade.h:47
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Receiving Mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:49
+msgid "Receiving Options"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
+msgid "Required Information"
+msgstr ""
+
+#: mail/mail-config.glade.h:53
+msgid "Select PGP binary"
+msgstr ""
+
+#: mail/mail-config.glade.h:54
+msgid "Send mail in HTML format by default."
+msgstr ""
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Sending Email"
+msgstr "��������"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Sending Mail"
+msgstr "��������"
+
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Sent"
+msgstr "��������"
+
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Sent and Draft Messages"
+msgstr "�������� ��� ���������"
+
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Sent messages folder:"
+msgstr "�������� ��� ���������"
+
+#: mail/mail-config.glade.h:61
+#, fuzzy
+msgid "Server Configuration"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: mail/mail-config.glade.h:62
+#, fuzzy
+msgid "Server Type: "
+msgstr "��������"
+
+#: mail/mail-config.glade.h:63
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config.glade.h:64
+msgid "Signature file:"
+msgstr ""
+
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Sources"
+msgstr "��� ����������"
+
+#: mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Special Folders"
+msgstr "_��������"
+
+#: mail/mail-config.glade.h:67
+msgid "Standard Unix mbox"
+msgstr ""
+
+#: mail/mail-config.glade.h:68
+msgid "Type"
+msgstr ""
+
+#: mail/mail-config.glade.h:69
+msgid "Use secure connection (SSL)"
+msgstr ""
+
+#: mail/mail-config.glade.h:70
+#, fuzzy
+msgid "Username:"
+msgstr "������_��"
+
+#: mail/mail-config.glade.h:71
 msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+"Welcome to the Evolution Mail Configuration Druid.\n"
+"\n"
+"Click \"Next\" to begin. "
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:949
-msgid "Evolution Account Wizard"
+#: 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 ""
 
-#: mail/mail-display.c:98
-#, c-format
+#: mail/mail-config-druid.c:99
 msgid ""
-"Could not open file %s:\n"
-"%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-display.c:131
-#, c-format
-msgid "Could not write data: %s"
+#: 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-display.c:229
+#: 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:445
+msgid "Evolution Account Wizard"
+msgstr ""
+
+#: mail/mail-display.c:194
 #, fuzzy
 msgid "Save Attachment"
 msgstr "��� ���������..."
 
-#: mail/mail-display.c:269
+#: mail/mail-display.c:234
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/mail-display.c:311
+#: mail/mail-display.c:295
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:313
+#: mail/mail-display.c:297
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:315
+#: mail/mail-display.c:299
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:334
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:365
+#: mail/mail-display.c:357
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:369
+#: mail/mail-display.c:361
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-format.c:504
+#: mail/mail-display.c:1102
+#, fuzzy
+msgid "Open link in browser"
+msgstr "������� �� ��� ��������"
+
+#: mail/mail-display.c:1104
+#, fuzzy
+msgid "Save as (FIXME)"
+msgstr "���������� ��� �������..."
+
+#: mail/mail-display.c:1106
+#, fuzzy
+msgid "Copy location (FIXME)"
+msgstr "_��������"
+
+#: mail/mail-format.c:518
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "��� ���������"
 
-#: mail/mail-format.c:626
-msgid "Reply-To:"
+#: mail/mail-format.c:560
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:856
+#: mail/mail-format.c:742
+#, fuzzy
+msgid "Loading message content"
+msgstr "����������� ��������"
+
+#: mail/mail-format.c:1046
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:1052
 #, fuzzy
 msgid "Encrypted message"
 msgstr "�������� ��� ���������"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:1053
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1438
+#: mail/mail-format.c:1137 mail/mail-format.c:1526
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1145 mail/mail-format.c:1534
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1747
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1759
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1454
+#: mail/mail-format.c:1763
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1488
+#: mail/mail-format.c:1797
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1493
+#: mail/mail-format.c:1802
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr ""
+#: mail/mail-local.c:337
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "�������� ��� ���������"
+
+#: mail/mail-local.c:509
+#, fuzzy, c-format
+msgid "Opening '%s'"
+msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-local.c:204
+#: mail/mail-local.c:787
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:208
+#: mail/mail-local.c:791
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:251
+#: mail/mail-local.c:815
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_���� ��������"
 
-#: mail/mail-local.c:269
+#. first, 'close' the old folder
+#: mail/mail-local.c:844
 msgid "Closing current folder"
 msgstr ""
 
-#: mail/mail-local.c:295
+#: mail/mail-local.c:876
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:313
+#: mail/mail-local.c:894
 #, fuzzy
 msgid "Creating new folder"
 msgstr "���������� ��� �������..."
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:908
 #, fuzzy
 msgid "Copying messages"
 msgstr "����������� ��������"
 
-#: mail/mail-local.c:348
+#: mail/mail-local.c:925
 #, 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:379
+#: mail/mail-local.c:964
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr ""
-
-#: mail/mail-local.c:789
-msgid "Register local folder"
-msgstr ""
-
-#: mail/mail-local.c:893
-#, fuzzy, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr "���������� ��� ��������� ���� ����������� �������"
-
-#: mail/mail-mt.c:85
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:87
+#: mail/mail-mt.c:192
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:107
-#, c-format
-msgid "Fetching email from %s"
-msgstr ""
-
-#: mail/mail-ops.c:109
-#, c-format
-msgid "Fetch email from %s"
+#: mail/mail-mt.c:679 mail/session.c:98
+msgid "Do you accept?"
 msgstr ""
 
-#: mail/mail-ops.c:359
-#, c-format
-msgid "There is no new mail at %s."
-msgstr ""
-
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr ""
+#: mail/mail-mt.c:873
+#, fuzzy
+msgid "Evolution progress"
+msgstr "�_����� ������������ ��� Evolution"
 
-#: mail/mail-ops.c:563
+#: mail/mail-ops.c:587
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:565
+#: mail/mail-ops.c:589
 #, fuzzy
 msgid "Sending message"
 msgstr "����������� ��������"
 
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr ""
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
-msgstr ""
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
-#, c-format
-msgid "Appending \"%s\""
-msgstr ""
+#: mail/mail-ops.c:704
+#, fuzzy, c-format
+msgid "Sending message %d of %d"
+msgstr "����������� ��������"
 
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
-msgstr ""
+#: mail/mail-ops.c:723
+#, fuzzy, c-format
+msgid "Failed on message %d of %d"
+msgstr "�������� �������� ���������"
 
-#: mail/mail-ops.c:912
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
+#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:914
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr ""
+#: mail/mail-ops.c:811
+#, fuzzy
+msgid "Saving message to folder"
+msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-ops.c:917
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr ""
+#: mail/mail-ops.c:884
+#, fuzzy, c-format
+msgid "Moving messages to %s"
+msgstr "��� ��������"
 
-#: mail/mail-ops.c:919
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr ""
+#: mail/mail-ops.c:884
+#, fuzzy, c-format
+msgid "Copying messages to %s"
+msgstr "����������� ��������"
 
-#: mail/mail-ops.c:950
+#: mail/mail-ops.c:900
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:953
+#: mail/mail-ops.c:903
 #, fuzzy
 msgid "Copying"
 msgstr "���������"
 
-#: 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:978
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-msgid "(No description)"
-msgstr ""
-
-#: mail/mail-ops.c:1179
+#: mail/mail-ops.c:1139
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "�������� �������� ���������"
 
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
+#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-ops.c:1351
-msgid "Synchronising folder"
-msgstr ""
+#: mail/mail-ops.c:1247
+#, fuzzy, c-format
+msgid "Opening store %s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-ops.c:1401
+#: mail/mail-ops.c:1434
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1450
+#: mail/mail-ops.c:1483
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "��� ��������"
 
-#: mail/mail-ops.c:1517
+#: mail/mail-ops.c:1550
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "����������� ��������"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1560
 #, 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
+#: mail/mail-ops.c:1634
 #, fuzzy
 msgid "Saving messages"
 msgstr "����������� ��������"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1713
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-ops.c:1935
+#: mail/mail-ops.c:1726
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:1740
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "�������� �������� ���������"
 
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr ""
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr ""
+#: mail/mail-ops.c:1814
+#, fuzzy
+msgid "Saving attachment"
+msgstr "��� ���������..."
 
-#: mail/mail-threads.c:302
-#, c-format
+#: mail/mail-ops.c:1829
+#, fuzzy, c-format
 msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
+"Cannot create output file: %s:\n"
+" %s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-threads.c:676
+#: mail/mail-ops.c:1857
 #, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
+msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr ""
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "����������"
 
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
+#: mail/mail-send-recv.c:138
+msgid "Cancelling ..."
 msgstr ""
 
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
+#: mail/mail-send-recv.c:233
+msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr ""
+#: mail/mail-send-recv.c:236
+#, fuzzy
+msgid "Receiving"
+msgstr "������"
 
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
+#: mail/mail-send-recv.c:285
+msgid "Updating ..."
 msgstr ""
 
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
+#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
+msgid "Waiting ..."
 msgstr ""
 
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
-msgstr ""
+#: mail/mail-send-recv.c:306
+#, fuzzy
+msgid "Sending"
+msgstr "��������"
 
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
+#: mail/mail-send-recv.c:471
+msgid "Cancelled."
 msgstr ""
 
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
+#: mail/mail-summary.c:109
+msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-tools.c:347
+#: mail/mail-tools.c:141
 #, c-format
-msgid "Saving changes to %s"
+msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:381
+#: mail/mail-tools.c:188
 #, fuzzy, c-format
 msgid "[%s] (forwarded message)"
 msgstr "�������� �������� ���������"
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:198
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:427
+#: mail/mail-tools.c:215
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "�������� �������� ���������"
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:217
 #, fuzzy
 msgid "Forwarded message (no subject)"
 msgstr "�������� �������� ���������"
 
-#: mail/mail-tools.c:530
+#: mail/mail-tools.c:414
 #, c-format
 msgid ""
-"Cannot open location `%s':\n"
-"%s"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
 msgstr ""
 
-#: mail/mail-vfolder.c:149
+#: mail/mail-vfolder.c:249
 #, fuzzy
 msgid "VFolders"
 msgstr "_��������"
 
-#: mail/mail-vfolder.c:298
+#: mail/mail-vfolder.c:427
 #, fuzzy
 msgid "New VFolder"
 msgstr "_���� ��������"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
 msgid "Reply"
 msgstr ""
 
-#: mail/mail-view.c:138
+#: 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:141
+#: 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:144
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
 #, fuzzy
 msgid "Forward this message"
 msgstr "�������� �������� ���������"
 
-#: mail/mail-view.c:148
+#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
 #, fuzzy
 msgid "Print the selected message"
 msgstr "�������� ��� ��������� ��� ���������"
 
-#: mail/mail-view.c:150
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
 #, fuzzy
 msgid "Delete this message"
 msgstr "�������� �������� ���������"
 
-#: mail/message-list.c:599
+#: mail/message-list.c:648
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:602
+#: mail/message-list.c:649
 #, fuzzy
 msgid "Seen"
 msgstr "��������"
 
-#: mail/message-list.c:605
+#: mail/message-list.c:650
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:890
-#, c-format
-msgid "[ %s ]"
+#: mail/message-list.c:651
+#, fuzzy
+msgid "Multiple Unseen Messages"
+msgstr "�������� ���� ���������"
+
+#: mail/message-list.c:652
+#, fuzzy
+msgid "Multiple Messages"
+msgstr "����������� ��������"
+
+#: mail/message-list.c:656
+msgid "Lowest"
 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
-#, c-format
-msgid "%s, et al."
+#: mail/message-list.c:657
+msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:905 mail/message-list.c:921
-msgid "<unknown>"
+#: mail/message-list.c:661
+msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:973
+#: mail/message-list.c:662
+msgid "Highest"
+msgstr ""
+
+#: mail/message-list.c:912
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:980
+#: mail/message-list.c:919
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:989
+#: mail/message-list.c:928
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:940
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1009
+#: mail/message-list.c:948
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1011
+#: mail/message-list.c:950
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:1109
+#: mail/message-list.c:1052
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1109
-#, fuzzy
-msgid "Attachment"
-msgstr "��� ���������"
-
-#: mail/message-list.c:1110
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "From"
 msgstr "���"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "Date"
 msgstr "����������"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "Received"
 msgstr "������"
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1054
 msgid "To"
 msgstr "����"
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1054
 msgid "Size"
 msgstr "�������"
 
-#: mail/openpgp-utils.c:78
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:81
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr ""
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#, fuzzy
+msgid "Folder"
+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."
-msgstr ""
+#: mail/subscribe-dialog.c:77
+#, fuzzy
+msgid "Store"
+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."
+#: mail/subscribe-dialog.c:138
+msgid "Display folders starting with:"
 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
+#: mail/subscribe-dialog.c:168
 #, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
-msgid "No recipients specified"
+#: mail/subscribe-dialog.c:271
+#, c-format
+msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/openpgp-utils.c:1065
+#: mail/subscribe-dialog.c:273
 #, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
+msgid "Unsubscribing to folder \"%s\""
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#. Construct the app
+#: mail/subscribe-dialog.c:873
+msgid "Manage Subscriptions"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #, fuzzy
-msgid "Folder"
+msgid "Folder name:"
+msgstr "����������� ������"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
 msgstr "_��������"
 
-#: mail/subscribe-dialog.c:63
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
-msgid "Store"
-msgstr "��� ����������"
+msgid "Specify where to create the folder:"
+msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
+#: 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 ""
 
-#: mail/subscribe-dialog.c:178
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/importer/importer.c:182
 #, c-format
-msgid "Getting store for \"%s\""
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
 msgstr ""
 
-#: mail/subscribe-dialog.c:181
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
 #, c-format
-msgid "Get store for \"%s\""
+msgid ""
+"Importing %s\n"
+"Importing item %d."
 msgstr ""
 
-#: mail/subscribe-dialog.c:289
+#: shell/importer/importer.c:341
 #, c-format
-msgid "Subscribing to folder \"%s\""
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
+#: shell/importer/importer.c:351
+msgid "Importing"
 msgstr ""
 
-#: mail/subscribe-dialog.c:297
+#: shell/importer/importer.c:359
 #, c-format
-msgid "Subscribe to folder \"%s\""
+msgid ""
+"Importing %s.\n"
+"Starting %s"
 msgstr ""
 
-#: mail/subscribe-dialog.c:300
+#: shell/importer/importer.c:372
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "�������� �������� ���������"
+
+#: shell/importer/importer.c:387
+#, fuzzy, c-format
+msgid "Error loading %s"
+msgstr "�������� �������� ���������"
+
+#: shell/importer/importer.c:402
 #, c-format
-msgid "Unsubscribe from folder \"%s\""
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/importer/importer.c:473
+msgid "Automatic"
+msgstr ""
+
+#: shell/importer/importer.c:523
+#, fuzzy
+msgid "Filename:"
+msgstr "����������� ������"
+
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
+#, fuzzy
+msgid "Select a file"
+msgstr "�����_����� �����������"
+
+#: shell/importer/importer.c:538
+#, fuzzy
+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 ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: 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/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:122
 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:123
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:157
+#: shell/e-setup.c:163
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
+#: shell/e-setup.c:166 shell/e-setup.c:234
 msgid "Evolution files successfully installed."
 msgstr ""
 
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
+#: shell/e-setup.c:195
+msgid "This seems to be the first time you are running Evolution."
 msgstr ""
 
-#: shell/e-setup.c:190
+#: shell/e-setup.c:196
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:215
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -4377,14 +6934,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:224
+#: shell/e-setup.c:230
 #, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:255
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -4392,7 +6949,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:267
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -4400,18 +6957,18 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:82
+#: shell/e-shell-folder-creation-dialog.c:99
 #, fuzzy, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: shell/e-shell-folder-creation-dialog.c:134
+#: shell/e-shell-folder-creation-dialog.c:156
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:225
+#: shell/e-shell-folder-creation-dialog.c:248
 #, fuzzy
 msgid "Evolution - Create new folder"
 msgstr "�� Evolution �� ������ �� ������������ ���� �������� ���������"
@@ -4422,1271 +6979,2177 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:297
+#: shell/e-shell-folder-selection-dialog.c:319
 #, fuzzy
 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:459 shell/e-shell-folder-title-bar.c:460
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:179
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:208
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:210
 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:374
 #, fuzzy
 msgid "Go to folder..."
 msgstr "���������� ��� �������..."
 
-#: shell/e-shell-view.c:140
+#: shell/e-shell-view.c:148
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:468
-#, fuzzy
-msgid "Folders"
-msgstr "_��������"
-
-#: shell/e-shell-view.c:1098
+#: shell/e-shell-view.c:1134
 #, c-format
 msgid "%s - Evolution %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1100
+#: shell/e-shell-view.c:1136
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr ""
 
-#: shell/e-shell.c:372
+#: shell/e-shell.c:378
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1212
+#: shell/e-shell.c:1248
 #, 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:134
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:137
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:260
 #, 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:265
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:276
 #, fuzzy
 msgid "_Small Icons"
 msgstr "����� ���������"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:277
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:279
 #, fuzzy
 msgid "_Large Icons"
 msgstr "������ ���������"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:280
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:291
 #, fuzzy
 msgid "_New Group..."
 msgstr "��� �����"
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:292
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:294
 #, fuzzy
 msgid "_Remove This Group..."
 msgstr "�������� ������"
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:295
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "�������� ��� ������ ������������"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:300
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "�������� ��� ������ ������������"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:301
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "�������� ��� ������ ������������"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:388
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:358
+#: shell/e-shortcuts.c:379
 #, fuzzy
 msgid "Error saving shortcuts."
 msgstr "������ ������������"
 
-#: shell/e-storage-set-view.c:338
+#: 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 "_���"
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-storage-set-view.c:649
 #, fuzzy
 msgid "View the selected folder"
 msgstr "�������� ��� ��������� ��� ���������"
 
-#: shell/e-storage.c:138
+#: shell/e-storage.c:178
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:389
+#: shell/e-storage.c:459
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:391
+#: shell/e-storage.c:461
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:393
+#: shell/e-storage.c:463
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:395
+#: shell/e-storage.c:465
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:397
+#: shell/e-storage.c:467
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:399
+#: shell/e-storage.c:469
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:401
+#: shell/e-storage.c:471
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:403
+#: shell/e-storage.c:473
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:405
+#: shell/e-storage.c:475
 msgid "Permission denied"
 msgstr ""
 
-#: shell/e-storage.c:407
+#: shell/e-storage.c:477
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:409
+#: shell/e-storage.c:479
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/main.c:74
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr ""
+
+#: shell/main.c:83
+#, 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"
-"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. 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"
 "\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"
+"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"
 "\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:108
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:132
+#: shell/main.c:139
 msgid "Cannot initialize the Evolution shell."
 msgstr ""
 
-#: shell/main.c:178
-msgid "Disable."
+#: shell/main.c:185
+msgid "Disable splash screen"
+msgstr ""
+
+#: shell/main.c:186
+msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:198
+#: shell/main.c:219
 #, fuzzy
 msgid "Cannot initialize the Bonobo component system."
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: ui/evolution-contact-editor.xml:7
+#: ui/evolution-addressbook.xml.h:2
 #, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "�_�������"
+msgid "Create new contact"
+msgstr "���������� ��� �������..."
 
-#: ui/evolution-contact-editor.xml:8
+#: ui/evolution-addressbook.xml.h:4
 #, fuzzy
-msgid "FIXME: Meeting Re_quest"
-msgstr "����_�� ������������"
+msgid "Delete a contact"
+msgstr "�������� ���������"
 
-#: ui/evolution-contact-editor.xml:10
+#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
 #, fuzzy
-msgid "FIXME: _Mail Message"
-msgstr "_������"
+msgid "Find"
+msgstr "�������������"
 
-#: ui/evolution-contact-editor.xml:11
+#: ui/evolution-addressbook.xml.h:6
 #, fuzzy
-msgid "FIXME: _Contact"
+msgid "Find a contact"
+msgstr "� ��������� ��������� ���"
+
+#: ui/evolution-addressbook.xml.h:7
+#, fuzzy
+msgid "New contact"
 msgstr "_��������"
 
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
+#, fuzzy
+msgid "Previews the message to be printed"
+msgstr "�������� ��� ���������"
 
-#: ui/evolution-contact-editor.xml:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
-msgid "FIXME: Task _Request"
-msgstr "����_�� ������������"
+msgid "Print contacts"
+msgstr "� ��������� ��������� ���"
 
-#: ui/evolution-contact-editor.xml:14
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
 #, fuzzy
-msgid "FIXME: _Journal Entry"
-msgstr "���������� �����_������"
+msgid "Stop"
+msgstr "��� ����������"
 
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
+#: ui/evolution-addressbook.xml.h:13
+msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
-msgstr ""
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "View All"
+msgstr "_���"
 
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:15
+#, fuzzy
+msgid "View all contacts"
+msgstr "�������� ���������"
 
-#: ui/evolution-contact-editor.xml:24
+#: ui/evolution-addressbook.xml.h:16
 #, fuzzy
-msgid "FIXME: Define Print _Styles..."
-msgstr "��_���� ����������"
+msgid "_Addressbook Sources..."
+msgstr "��� ����������"
 
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "_Contact"
+msgstr "_��������"
 
-#: ui/evolution-contact-editor.xml:35
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
+#: ui/evolution-contact-editor.xml.h:15
 #, fuzzy
-msgid "FIXME: Save Attac_hments..."
-msgstr "��� ���������..."
+msgid "_Print..."
+msgstr "�������������"
 
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
+#: ui/evolution-addressbook.xml.h:19
+msgid "_Search for contacts"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
+#: 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"
+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"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:41
+#: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Page Set_up"
-msgstr "�������������"
+msgid "Create a new all day Event"
+msgstr "���������� ��� �������..."
 
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
+#: ui/evolution-calendar.xml.h:5
+#, fuzzy
+msgid "Create a new appointment"
+msgstr "���������� ��� �������..."
+
+#: ui/evolution-calendar.xml.h:6
+#, fuzzy
+msgid "Create a new calendar"
+msgstr "���������� ��� �������..."
+
+#: ui/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Day"
+msgstr "��������"
+
+#: ui/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Go To"
+msgstr "������"
+
+#: ui/evolution-calendar.xml.h:9
+msgid "Go back in time"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:63
-msgid "FIXME: Paste _Special..."
+#: ui/evolution-calendar.xml.h:10
+msgid "Go forward in time"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:68
-msgid "FIXME: Mark as U_nread"
+#: ui/evolution-calendar.xml.h:11
+msgid "Go to _Date"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:72
+#: ui/evolution-calendar.xml.h:12
 #, fuzzy
-msgid "_Object"
-msgstr "����"
+msgid "Go to _Today"
+msgstr "������"
 
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
+#: ui/evolution-calendar.xml.h:14
+msgid "Go to present time"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr ""
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Month"
+msgstr "���������"
 
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
+#: ui/evolution-calendar.xml.h:17
+msgid "New _Event"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
+#: 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-contact-editor.xml:93
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "_��������"
+msgid "Open Calendar"
+msgstr "����������"
 
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
+#: ui/evolution-calendar.xml.h:21
+msgid "Prev"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
+#: ui/evolution-calendar.xml.h:22
+msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:102
-msgid "Ne_xt"
-msgstr ""
+#: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Print calendar"
+msgstr "����������"
 
-#: ui/evolution-contact-editor.xml:104
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
-msgid "_Toolbars"
-msgstr "�_�������"
+msgid "Print this Calendar"
+msgstr "�� ���������� ���"
 
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
+#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
+#, fuzzy
+msgid "Save As"
+msgstr "����������"
+
+#: ui/evolution-calendar.xml.h:28
+msgid "Save calendar as something else"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show 1 day"
+msgstr "�������� �������_����"
+
+#: ui/evolution-calendar.xml.h:31
+msgid "Show 1 month"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
+#: ui/evolution-calendar.xml.h:32
+msgid "Show 1 week"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
+#: ui/evolution-calendar.xml.h:33
+msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
+#: 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
+msgid "W_ork Week"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
+#: ui/evolution-calendar.xml.h:36
+msgid "Week"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
+#: ui/evolution-calendar.xml.h:37
+#, fuzzy
+msgid "_Appointment"
+msgstr "�_�������"
+
+#: ui/evolution-calendar.xml.h:38
+#, fuzzy
+msgid "_Day"
+msgstr "��������"
+
+#: ui/evolution-calendar.xml.h:39
+#, 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:41
+#, fuzzy
+msgid "_Open Calendar"
+msgstr "����������"
+
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "_Save As..."
+msgstr "���������� ��� �������..."
+
+#: ui/evolution-calendar.xml.h:45
+msgid "_Week"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
+#: ui/evolution-contact-editor.xml.h:2
+#, fuzzy
+msgid "Delete this item"
+msgstr "�������� �������� ���������"
+
+#: ui/evolution-contact-editor.xml.h:3
+msgid "Delete..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
+#: ui/evolution-contact-editor.xml.h:4
+#, fuzzy
+msgid "Help"
+msgstr "������_��"
+
+#: ui/evolution-contact-editor.xml.h:5
+#, fuzzy
+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
+#, 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 ""
 
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
+#: ui/evolution-contact-editor.xml.h:11
+msgid "Se_nd contact to other..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
+#: ui/evolution-contact-editor.xml.h:12
+msgid "See online help"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:137
+#: ui/evolution-contact-editor.xml.h:13
 #, fuzzy
-msgid "_Forms"
-msgstr "���"
+msgid "Send _message to contact..."
+msgstr "_��������"
 
-#: ui/evolution-contact-editor.xml:142
+#: 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 "FIXME: _New Contact"
-msgstr "_��������"
+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
+#, 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-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
+msgid "About..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:145
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
 #, fuzzy
-msgid "FIXME: New _Letter to Contact"
-msgstr "_��������"
+msgid "Actio_ns"
+msgstr "�_��������"
 
-#: ui/evolution-contact-editor.xml:146
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
 #, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "_��������"
+msgid "Address _Book... (FIXME)"
+msgstr "���������� ��� �������..."
 
-#: ui/evolution-contact-editor.xml:147
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
 #, fuzzy
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "_��������"
+msgid "C_lear"
+msgstr "����������"
 
-#: ui/evolution-contact-editor.xml:148
+#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
 #, fuzzy
-msgid "FIXME: _Plan a Meeting..."
-msgstr "_��������"
+msgid "C_ut"
+msgstr "����"
 
-#: ui/evolution-contact-editor.xml:149
+#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
 #, fuzzy
-msgid "FIXME: New _Task for Contact"
-msgstr "_��������"
+msgid "Chec_k Names (FIXME)"
+msgstr "_������"
 
-#: ui/evolution-contact-editor.xml:150
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
 #, fuzzy
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "���������� �����_������"
+msgid "Clear"
+msgstr "����������"
 
-#: ui/evolution-contact-editor.xml:152
-msgid "FIXME: _Flag for Follow Up..."
-msgstr ""
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
+#, fuzzy
+msgid "Clear the selection"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-contact-editor.xml:153
+#: ui/evolution-event-editor.xml.h:11
 #, fuzzy
-msgid "FIXME: _Display Map of Address"
-msgstr "_������"
+msgid "Close this appointment"
+msgstr "�������� �������� ���������"
 
-#: ui/evolution-contact-editor.xml:154
+#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
 #, fuzzy
-msgid "FIXME: _Open Web Page"
-msgstr "_������"
+msgid "Cop_y to Folder... (FIXME)"
+msgstr "���������� ��� �������..."
 
-#: ui/evolution-contact-editor.xml:156
-msgid "FIXME: Forward as _vCard"
+#: 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:14 ui/evolution-task-editor-dialog.xml.h:15
+#, fuzzy
+msgid "Copy the selection"
+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:16 ui/evolution-task-editor-dialog.xml.h:17
+msgid "Cut the selection"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
+#: ui/evolution-event-editor.xml.h:18
+#, fuzzy
+msgid "Delete this appointment"
+msgstr "�������� �������� ���������"
+
+#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
+msgid "Dump XML"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
+#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
+msgid "Dump the UI Xml description"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:170
+#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
 #, fuzzy
-msgid "F_ormat"
-msgstr "���"
-
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr "�_�������"
+msgid "Fi_rst Item in Folder (FIXME)"
+msgstr "���������� ��� �������..."
 
-#: ui/evolution-contact-editor.xml:172
+#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
 #, fuzzy
-msgid "Actio_ns"
-msgstr "�_��������"
+msgid "For_ward (FIXME)"
+msgstr "���������� �����_������"
+
+#: ui/evolution-event-editor.xml.h:23
+msgid "Forward as v_Calendar (FIXME)"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:246
-msgid "FIXME: Previous"
+#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
+msgid "Go to the next item"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:247
+#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
 msgid "Go to the previous item"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:249
+#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
 #, fuzzy
-msgid "FIXME: Next"
+msgid "In_complete Task (FIXME)"
 msgstr "_��������"
 
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
+#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
+msgid "Modify the file's properties"
 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
-msgid "%A, %B %d, %Y"
+#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
+msgid "N_ext"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
+#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
+msgid "Paste"
+msgstr "����������"
+
+#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
+#, fuzzy
+msgid "Paste the clipboard"
+msgstr "���������� ������������ ��� �� ��������"
+
+#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
+msgid "Pre_vious"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
+#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
+msgid "Previous"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
+#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
+#, fuzzy
+msgid "Print Pre_view"
+msgstr "�������� ��� ��������� ��� ���������"
+
+#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
+#, fuzzy
+msgid "Print S_etup..."
+msgstr "�������������"
+
+#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
+#, fuzzy
+msgid "Print Setup"
+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
+#, fuzzy
+msgid "Save"
+msgstr "����������"
+
+#: ui/evolution-event-editor.xml.h:43
+msgid "Save the appointment and close the dialog box"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
+#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
+#: ui/evolution-task-editor-dialog.xml.h:53
+#, fuzzy
+msgid "Save the current file"
+msgstr "�������� ���� ��� �������� ������������"
+
+#: ui/evolution-event-editor.xml.h:46
+msgid "Schedule _Meeting"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
+#: ui/evolution-event-editor.xml.h:47
+msgid "Schedule some sort of a meeting"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:68
+#: ui/evolution-task-editor-dialog.xml.h:57
 #, fuzzy
-msgid "_Options"
-msgstr "�_��������"
+msgid "Select All"
+msgstr "_���� ��������"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
+#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+#, fuzzy
+msgid "Select everything"
+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 ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
+#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+#, fuzzy
+msgid "Task _Request (FIXME)"
+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 ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
+#: 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 ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
+#: 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 "_��������"
+
+#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
+#, 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 ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
+#: 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
+#, fuzzy
+msgid "_Help"
+msgstr "������_��"
+
+#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
+#, fuzzy
+msgid "_Item (FIXME)"
+msgstr "_��������"
+
+#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
+#, fuzzy
+msgid "_Journal Entry (FIXME)"
+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-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
+#, fuzzy
+msgid "_Mail Message (FIXME)"
+msgstr "_������"
+
+#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
+#, fuzzy
+msgid "_Move to Folder... (FIXME)"
+msgstr "���������� ��� �������..."
+
+#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
+#, fuzzy
+msgid "_Note (FIXME)"
+msgstr "_��������"
+
+#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
+#, fuzzy
+msgid "_Paste"
+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 "�������������"
+
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
+#: ui/evolution-task-editor-dialog.xml.h:83
+#, 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
+#, fuzzy
+msgid "_Task (FIXME)"
+msgstr "����_�� ������������"
+
+#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+#, fuzzy
+msgid "_Unread Item (FIXME)"
+msgstr "_��������"
+
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Add Service"
+msgstr "��� ����������"
+
+#: ui/evolution-executive-summary.xml.h:2
+msgid "Add a new service to the Executive Summary"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
+#: ui/evolution-executive-summary.xml.h:3
+#, fuzzy
+msgid "Create a new email"
+msgstr "���������� ��� �������..."
+
+#: ui/evolution-executive-summary.xml.h:4
+#, fuzzy
+msgid "Executive Summary Settings..."
+msgstr "��������"
+
+#: ui/evolution-executive-summary.xml.h:5
+#, fuzzy
+msgid "New Mail"
+msgstr "_������"
+
+#: ui/evolution-mail.xml.h:2
+msgid "Apply any new filters to the mail in this box"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
+#: ui/evolution-mail.xml.h:3
+msgid "Change the properties of this folder"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
+#: ui/evolution-mail.xml.h:4
+#, fuzzy
+msgid "Compose"
+msgstr "��� ����������"
+
+#: ui/evolution-mail.xml.h:5
+#, fuzzy
+msgid "Compose a new message"
+msgstr "�������� ���� ���������"
+
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Configure Folder..."
+msgstr "���������� ��� �������..."
+
+#: ui/evolution-mail.xml.h:8
+#, fuzzy
+msgid "Copy message to a new folder"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: ui/evolution-mail.xml.h:9
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: ui/evolution-mail.xml.h:10
+#, fuzzy
+msgid "Create _Virtual Folder From Message"
+msgstr "�������� ��������"
+
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Delete the selected messages"
+msgstr "�������� ��� ��������� ��� ���������"
+
+#: ui/evolution-mail.xml.h:14
+msgid "Display all of the message headers"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
+#: ui/evolution-mail.xml.h:15
+#, fuzzy
+msgid "Edit Message"
+msgstr "�������� ��� ���������"
+
+#: ui/evolution-mail.xml.h:16
+#, fuzzy
+msgid "Edit the current message"
+msgstr "�������� ��� ��������� ��� ���������"
+
+#: ui/evolution-mail.xml.h:17
+msgid "Empty _Trash"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
+#: ui/evolution-mail.xml.h:18
+msgid "Expunge"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: ui/evolution-mail.xml.h:19
+msgid "Filter on Se_nder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:20
 #, fuzzy
-msgid "Meeting _start time:"
-msgstr "��_���� ����������"
+msgid "Filter on _Recipients"
+msgstr "��������� ���������"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: ui/evolution-mail.xml.h:21
 #, fuzzy
-msgid "Meeting _end time:"
-msgstr "��_���� ����������"
+msgid "Filter on _Subject"
+msgstr "����"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
+#: ui/evolution-mail.xml.h:22
+msgid "Finaly remove all mails tagged for deletion"
 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"
-msgstr ""
+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Forget _Passwords"
+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.xml.h:25
+#, fuzzy
+msgid "Forward As"
+msgstr "�������� �������� ���������"
+
+#: ui/evolution-mail.xml.h:27
+msgid "Forward the selected mail to someone"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
+#: ui/evolution-mail.xml.h:29
+msgid "Forward this message in-line with your mail, so you can edit it"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:407
+#: ui/evolution-mail.xml.h:30
 #, fuzzy
-msgid "Now"
-msgstr "_���"
+msgid "Full _Headers"
+msgstr "����������� ������"
 
-#: widgets/misc/e-dateedit.c:413
+#: ui/evolution-mail.xml.h:31
 #, fuzzy
-msgid "Today"
-msgstr "������"
+msgid "Hide Deleted Messages"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#. 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.xml.h:32
+#, fuzzy
+msgid "Hide S_elected Messages"
+msgstr "�������� ��� ��������� ��� ���������"
+
+#: ui/evolution-mail.xml.h:33
+#, fuzzy
+msgid "Hide _Deleted Messages"
+msgstr "�������� ��� ��������� ��� ���������"
+
+#: ui/evolution-mail.xml.h:34
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "�������� �������� ���������"
+
+#: ui/evolution-mail.xml.h:35
+msgid "Invert Selection"
 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.xml.h:36
+msgid "Manage _Subscriptions..."
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:176
-msgid "Sear_ch"
+#: ui/evolution-mail.xml.h:37
+msgid "Mar_k as Read"
 msgstr ""
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
+#: ui/evolution-mail.xml.h:38
+msgid "Mark All as R_ead"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Delete Contact?"
-#~ msgstr "�������� ���������"
+#: ui/evolution-mail.xml.h:39
+msgid "Mark As Read"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:40
+msgid "Mark As U_nread"
+msgstr ""
 
+#: ui/evolution-mail.xml.h:41
+msgid "Mark as U_nread"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:42
 #, fuzzy
-#~ msgid "Addressbook Sources"
-#~ msgstr "��� ����������"
+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"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:44
 #, fuzzy
-#~ msgid "Find..."
-#~ msgstr "�������������"
+msgid "Move"
+msgstr "_������"
 
+#: ui/evolution-mail.xml.h:45
 #, fuzzy
-#~ msgid "Message Recipients"
-#~ msgstr "��������� ���������"
+msgid "Move message to a new folder"
+msgstr "���������� ��� ��������� ���� ����������� �������"
 
+#: ui/evolution-mail.xml.h:46
 #, fuzzy
-#~ msgid "Select Names"
-#~ msgstr "�����_����� �����������"
+msgid "Move selected messages to another folder"
+msgstr "���������� ��� ��������� ���� ����������� �������"
 
+#: ui/evolution-mail.xml.h:47
 #, fuzzy
-#~ msgid "Select name from:"
-#~ msgstr "�����_����� �����������"
+msgid "Open in New Window"
+msgstr "������� �� ��� ��������"
 
+#: ui/evolution-mail.xml.h:48
 #, fuzzy
-#~ msgid "o"
-#~ msgstr "����"
+msgid "Open the current message in a new window"
+msgstr "�������� ��� ���������"
 
+#: ui/evolution-mail.xml.h:53
 #, fuzzy
-#~ msgid "Body"
-#~ msgstr "������"
+msgid "Print Preview of message..."
+msgstr "�������� ��� ��������� ��� ���������"
 
+#: ui/evolution-mail.xml.h:54
+msgid "Print message to the printer"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:55
 #, fuzzy
-#~ msgid "Fonts"
-#~ msgstr "���������"
+msgid "Print message..."
+msgstr "����������� ��������"
+
+#: ui/evolution-mail.xml.h:58
+msgid "Redirect (FIXME: implement me)"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:61
+msgid "Reply to _All"
+msgstr ""
 
+#: ui/evolution-mail.xml.h:62
+msgid "Reply to all"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:64
 #, fuzzy
-#~ msgid "Format"
-#~ msgstr "���"
+msgid "Reply to sender"
+msgstr "���������� ��� �������..."
 
+#: ui/evolution-mail.xml.h:66
 #, fuzzy
-#~ msgid "Options"
-#~ msgstr "�_��������"
+msgid "S_ource"
+msgstr "��� ����������"
 
+#: ui/evolution-mail.xml.h:67
 #, fuzzy
-#~ msgid "Page"
-#~ msgstr "����������"
+msgid "Save the message into a new file"
+msgstr "���������� ��� ��������� ���� ����������� �������"
 
+#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
 #, fuzzy
-#~ msgid "Paper"
-#~ msgstr "����������"
+msgid "Select _All"
+msgstr "_���� ��������"
 
+#: ui/evolution-mail.xml.h:70
 #, fuzzy
-#~ msgid "Portrait"
-#~ msgstr "�������������"
+msgid "Select _Thread"
+msgstr "�����_����� �����������"
 
+#: ui/evolution-mail.xml.h:71
 #, fuzzy
-#~ msgid "Sections:"
-#~ msgstr "�_��������"
+msgid "Send / Receive"
+msgstr "������"
+
+#: ui/evolution-mail.xml.h:72
+msgid "Send a reply to the person who sent you this mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:73
+msgid "Send a single mail in reply to all the selected mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:74
+msgid ""
+"Send queued mail\n"
+"    and retrieve new mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:76
+msgid "Send queued mail and retrieve new mail"
+msgstr ""
 
+#: ui/evolution-mail.xml.h:77
 #, fuzzy
-#~ msgid "Size:"
-#~ msgstr "�������"
+msgid "Show _All"
+msgstr "����������� ��������"
 
+#: ui/evolution-mail.xml.h:79
 #, fuzzy
-#~ msgid "Top:"
-#~ msgstr "����:"
+msgid "Threaded Message list"
+msgstr "�������� �������� ���������"
 
+#: ui/evolution-mail.xml.h:80
 #, fuzzy
-#~ msgid "Calendar Server"
-#~ msgstr "����������"
+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
 #, fuzzy
-#~ msgid "Evolution calendar iTip/iMip viewer"
-#~ msgstr "�_����� ������������ ��� Evolution"
+msgid "VFolder on _Recipients"
+msgstr "��������� ���������"
 
+#: ui/evolution-mail.xml.h:84
 #, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr "������������� ��� ���������� ������� Bonobo ����������"
+msgid "VFolder on _Subject"
+msgstr "����"
+
+#: ui/evolution-mail.xml.h:85
+msgid "View Raw Message Source"
+msgstr ""
 
+#: ui/evolution-mail.xml.h:86
 #, fuzzy
-#~ msgid "Edit appointment"
-#~ msgstr "�_�������"
+msgid "Virtual Folder _Editor..."
+msgstr "_��������"
 
+#: ui/evolution-mail.xml.h:87
 #, fuzzy
-#~ msgid "Calendar"
-#~ msgstr "����������"
+msgid "_Apply Filters"
+msgstr "_��������"
 
+#: ui/evolution-mail.xml.h:88
 #, fuzzy
-#~ msgid "TaskPad"
-#~ msgstr "�������_����"
+msgid "_Attachment"
+msgstr "��� ���������"
 
+#: ui/evolution-mail.xml.h:89
 #, fuzzy
-#~ msgid "seconds."
-#~ msgstr "��������"
+msgid "_Copy to Folder..."
+msgstr "���������� ��� �������..."
 
+#: ui/evolution-mail.xml.h:90
 #, fuzzy
-#~ msgid "Normal"
-#~ msgstr "���"
+msgid "_Create Filter From Message"
+msgstr "�������� ��������"
+
+#: ui/evolution-mail.xml.h:92
+msgid "_Expunge"
+msgstr ""
 
+#: ui/evolution-mail.xml.h:93
 #, fuzzy
-#~ msgid "Task"
-#~ msgstr "�������_����"
+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 "_Contacts..."
-#~ msgstr "_��������"
+msgid "_Mail Message"
+msgstr "_������"
 
+#: ui/evolution-mail.xml.h:99
 #, fuzzy
-#~ msgid "_Priority:"
-#~ msgstr "�������������"
+msgid "_Mail Settings..."
+msgstr "�_��������"
 
+#: ui/evolution-mail.xml.h:100
 #, fuzzy
-#~ msgid "Appointment Basics"
-#~ msgstr "�_�������"
+msgid "_Move to Folder..."
+msgstr "���������� ��� �������..."
 
+#: ui/evolution-mail.xml.h:101
 #, fuzzy
-#~ msgid "Days"
-#~ msgstr "��������"
+msgid "_Open Selected Items"
+msgstr "�������� ��� ��������� ��� ���������"
+
+#: ui/evolution-mail.xml.h:103
+msgid "_Quoted"
+msgstr ""
 
+#: ui/evolution-mail.xml.h:104
 #, fuzzy
-#~ msgid "Exceptions"
-#~ msgstr "�_��������"
+msgid "_Reply"
+msgstr "������"
 
+#: ui/evolution-mail.xml.h:105
 #, fuzzy
-#~ msgid "Modify"
-#~ msgstr "������"
+msgid "_Resend Messages"
+msgstr "����������� ��������"
 
+#: ui/evolution-mail.xml.h:107
 #, fuzzy
-#~ msgid "Pri_vate"
-#~ msgstr "����������"
+msgid "_Save Message As..."
+msgstr "���������� ��� �������..."
 
+#: ui/evolution-mail.xml.h:108
 #, fuzzy
-#~ msgid "_Mail"
-#~ msgstr "_������"
+msgid "_Send / Receive"
+msgstr "������"
+
+#: ui/evolution-mail.xml.h:109
+msgid "_Threaded"
+msgstr ""
 
+#: ui/evolution-mail.xml.h:111
+msgid "_Undelete"
+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
 #, fuzzy
-#~ msgid "month(s)"
-#~ msgstr "���������"
+msgid "Close the current file"
+msgstr "�������� ���� ��� �������� ������������"
 
+#: ui/evolution-message-composer.xml.h:5
 #, fuzzy
-#~ msgid "April"
-#~ msgstr "����������"
+msgid "Encrypt this message with PGP"
+msgstr "�������� ��� ���������"
 
+#: ui/evolution-message-composer.xml.h:6
 #, fuzzy
-#~ msgid "Go To Today"
-#~ msgstr "������"
+msgid "F_ormat"
+msgstr "���"
 
+#: ui/evolution-message-composer.xml.h:7
+msgid "HTML"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 #, fuzzy
-#~ msgid "May"
-#~ msgstr "������"
+msgid "Insert a file as text into the message"
+msgstr "��������� ������� ��� ������"
+
+#: ui/evolution-message-composer.xml.h:9
+msgid "Insert text file..."
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:11
 #, fuzzy
-#~ msgid "Attachment properties"
-#~ msgstr "���������"
+msgid "Open a file"
+msgstr "������� ��������"
+
+#: ui/evolution-message-composer.xml.h:12
+msgid "PGP Encrypt"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:17
+msgid "Save _Draft"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
 #, fuzzy
-#~ msgid "Edit VFolders"
-#~ msgstr "_��������"
+msgid "Save in _folder... (FIXME)"
+msgstr "���������� ��� �������..."
 
+#: ui/evolution-message-composer.xml.h:19
 #, fuzzy
-#~ msgid "Filter Rules"
-#~ msgstr "_��������"
+msgid "Save in folder..."
+msgstr "���������� ��� �������..."
+
+#: ui/evolution-message-composer.xml.h:21
+msgid "Save the current file with a different name"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save the message in a specified folder"
+msgstr "���������� ��� ��������� ���� ����������� �������"
 
+#: ui/evolution-message-composer.xml.h:23
+msgid "Send"
+msgstr "��������"
+
+#: ui/evolution-message-composer.xml.h:24
 #, fuzzy
-#~ msgid "Virtual Folders"
-#~ msgstr "_��������"
+msgid "Send _Later"
+msgstr "��������"
 
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
-#~ msgid "vFolder Sources"
-#~ msgstr "��� ����������"
+msgid "Send _later"
+msgstr "��������"
+
+#: ui/evolution-message-composer.xml.h:26
+msgid "Send the mail in HTML format"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
-#~ msgid "Hide Subject"
-#~ msgstr "����"
+msgid "Send the message later"
+msgstr "�������� ��� ���������"
 
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
-#~ msgid "Hide Messages"
-#~ msgstr "����������� ��������"
+msgid "Send the message now"
+msgstr "�������� ��� ���������"
 
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "����"
+msgid "Send this message now"
+msgstr "�������� �������� ���������"
 
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
-#~ msgid "Current store format:"
-#~ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
+msgid "Show / hide attachments"
+msgstr "��������/�������� �����������"
 
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
-#~ msgid "Mailbox Format"
-#~ msgstr "���"
+msgid "Show _attachments"
+msgstr "�������� �������_����"
 
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
-#~ msgid "mbox"
-#~ msgstr "�����������"
+msgid "Show attachments"
+msgstr "�������� �������_����"
 
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "���������"
+msgid "Sign this message with your PGP key"
+msgstr "�������� �������� ���������"
 
+#: ui/evolution-message-composer.xml.h:34
+msgid "Toggles whether the BCC field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:35
+msgid "Toggles whether the CC field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "��������� ��� �������������"
+msgid "Toggles whether the From chooser is displayed"
+msgstr "�� URI ��� �� ��������� � ����������� ��������"
+
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:39
+msgid "_Bcc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:40
+msgid "_Cc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:47
+msgid "_Insert"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:48
 #, fuzzy
-#~ msgid "Done"
-#~ msgstr "������_��"
+msgid "_Insert text file... (FIXME)"
+msgstr "���������� ��� �������..."
 
+#: ui/evolution-message-composer.xml.h:49
 #, fuzzy
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "�_����� ������������ ��� Evolution"
+msgid "_Open..."
+msgstr "����_���"
 
+#: ui/evolution-message-composer.xml.h:50
+msgid "_Reply-To Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:52
+msgid "_Security"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:1
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:3
 #, fuzzy
-#~ msgid "Full Name:"
-#~ msgstr "����������� ������"
+msgid "F_older"
+msgstr "_��������"
+
+#: ui/evolution-subscribe.xml.h:4
+msgid "Refresh List"
+msgstr ""
 
+#: ui/evolution-subscribe.xml.h:5
+msgid "Refresh List of Folders"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:6
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:8
 #, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "������_��"
+msgid "Subscribe"
+msgstr "��� ����������"
 
+#: ui/evolution-subscribe.xml.h:9
+msgid "Unsubscribe"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:5
 #, fuzzy
-#~ msgid "Mail Account"
-#~ msgstr "����� ���������"
+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 "News"
-#~ msgstr "_���"
+msgid "Meeting Re_quest (FIXME)"
+msgstr "����_�� ������������"
 
+#: ui/evolution-task-editor-dialog.xml.h:43
 #, fuzzy
-#~ msgid "Optional"
-#~ msgstr "�_��������"
+msgid "Redo"
+msgstr "��������"
 
+#: ui/evolution-task-editor-dialog.xml.h:44
 #, fuzzy
-#~ msgid "Save password"
-#~ msgstr "����������"
+msgid "Redo the undone action"
+msgstr "������� ���������� �����������"
 
+#: ui/evolution-task-editor-dialog.xml.h:45
 #, fuzzy
-#~ msgid "Servers"
-#~ msgstr "��������"
+msgid "Replace"
+msgstr "������"
 
+#: ui/evolution-task-editor-dialog.xml.h:46
 #, fuzzy
-#~ msgid "Sources"
-#~ msgstr "��� ����������"
+msgid "Replace a string"
+msgstr "������"
+
+#: ui/evolution-task-editor-dialog.xml.h:47
+msgid "Reply to A_ll (FIXME)"
+msgstr ""
 
+#: ui/evolution-task-editor-dialog.xml.h:48
 #, fuzzy
-#~ msgid "minute(s)"
-#~ msgstr "���������"
+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 ""
+
+#: 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
 #, fuzzy
-#~ msgid "Mail source type:"
-#~ msgstr "������ ������������"
+msgid "Undo the last action"
+msgstr "������� ���������� �����������"
 
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
 #, fuzzy
-#~ msgid "Add Source"
-#~ msgstr "��� ����������"
+msgid "_Appointment (FIXME)"
+msgstr "�_�������"
 
+#: ui/evolution-task-editor-dialog.xml.h:77
 #, fuzzy
-#~ msgid "Add News Server"
-#~ msgstr "��� �����"
+msgid "_Mark Complete (FIXME)"
+msgstr "_������"
 
+#: ui/evolution-task-editor-dialog.xml.h:84
 #, fuzzy
-#~ msgid "Mail Sources"
-#~ msgstr "������ ������������"
+msgid "_Reply (FIXME)"
+msgstr "����_�� ������������"
 
+#: ui/evolution-tasks.xml.h:2
 #, fuzzy
-#~ msgid "News Sources"
-#~ msgstr "��� ����������"
+msgid "Create a new task"
+msgstr "���������� ��� �������..."
 
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
-#~ msgid "Delete a contact"
-#~ msgstr "�������� ���������"
+msgid "New Task"
+msgstr "�������_����"
 
+#: ui/evolution-tasks.xml.h:5
+msgid "Save task as something else"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:6
+msgid "Tasks Preferences..."
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:9
 #, fuzzy
-#~ msgid "Print contacts"
-#~ msgstr "� ��������� ��������� ���"
+msgid "_Task"
+msgstr "�������_����"
 
+#: ui/evolution.xml.h:1
+msgid "About Evolution..."
+msgstr ""
+
+#: ui/evolution.xml.h:3
 #, fuzzy
-#~ msgid "View all contacts"
-#~ msgstr "�������� ���������"
+msgid "Close this window"
+msgstr "�������� �������� ���������"
+
+#: ui/evolution.xml.h:4
+msgid "Customi_ze Toolbars..."
+msgstr ""
+
+#: ui/evolution.xml.h:5
+msgid "Customize"
+msgstr ""
+
+#: ui/evolution.xml.h:6
+msgid "Customize toolbars"
+msgstr ""
+
+#: ui/evolution.xml.h:7
+msgid "Display a different folder"
+msgstr ""
+
+#: ui/evolution.xml.h:8
+msgid "E_xit"
+msgstr ""
 
+#: ui/evolution.xml.h:9
 #, fuzzy
-#~ msgid "_Print Contacts..."
-#~ msgstr "� ��������� ��������� ���"
+msgid "Evolution bar _shortcut"
+msgstr "�_����� ������������ ��� Evolution"
 
+#: ui/evolution.xml.h:10
+msgid "Exit the program"
+msgstr ""
+
+#: ui/evolution.xml.h:11
 #, fuzzy
-#~ msgid "Ca_lendar"
-#~ msgstr "����������"
+msgid "Getting _Started"
+msgstr "��_���� ����������"
+
+#: ui/evolution.xml.h:12
+msgid "Import an external file format"
+msgstr ""
+
+#: ui/evolution.xml.h:13
+msgid "Main toolbar"
+msgstr ""
+
+#: ui/evolution.xml.h:14
+msgid "Show information about Evolution"
+msgstr ""
 
+#: ui/evolution.xml.h:15
+msgid "Submit Bug Report"
+msgstr ""
+
+#: ui/evolution.xml.h:16
+msgid "Submit _Bug Report"
+msgstr ""
+
+#: ui/evolution.xml.h:17
+msgid "Submit bug report using Bug Buddy."
+msgstr ""
+
+#: ui/evolution.xml.h:18
 #, fuzzy
-#~ msgid "Month"
-#~ msgstr "���������"
+msgid "Toggle whether to show the folder bar"
+msgstr "�������� ��� ������ ������������"
 
+#: ui/evolution.xml.h:19
 #, fuzzy
-#~ msgid "Open a calendar"
-#~ msgstr "�� ���������� ���"
+msgid "Toggle whether to show the shortcut bar"
+msgstr "�������� ��� ������ ������������"
 
+#: ui/evolution.xml.h:20
+msgid "Using the C_ontact Manager"
+msgstr ""
+
+#: ui/evolution.xml.h:21
 #, fuzzy
-#~ msgid "Print this calendar"
-#~ msgstr "�� ���������� ���"
+msgid "Using the _Calendar"
+msgstr "����������"
 
-#~ msgid "_New"
-#~ msgstr "_���"
+#: ui/evolution.xml.h:22
+msgid "Using the _Mailer"
+msgstr ""
+
+#: ui/evolution.xml.h:23
+msgid "Work Offline"
+msgstr ""
+
+#: ui/evolution.xml.h:24
+msgid "_About Evolution..."
+msgstr ""
 
+#: ui/evolution.xml.h:25
+msgid "_Actions"
+msgstr "�_��������"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
-#~ msgid "_Open Calendar"
-#~ msgstr "����������"
+msgid "_Folder Bar"
+msgstr "_��������"
 
+#: ui/evolution.xml.h:33
 #, fuzzy
-#~ msgid "_Print this calendar"
-#~ msgstr "�� ���������� ���"
+msgid "_Go to Folder..."
+msgstr "���������� ��� �������..."
 
+#: ui/evolution.xml.h:35
 #, fuzzy
-#~ msgid "_Save As..."
-#~ msgstr "���������� ��� �������..."
+msgid "_Import file..."
+msgstr "���������"
+
+#: ui/evolution.xml.h:36
+msgid "_Index"
+msgstr ""
 
+#: ui/evolution.xml.h:37
 #, fuzzy
-#~ msgid "Delete this item"
-#~ msgstr "�������� �������� ���������"
+msgid "_Mail message"
+msgstr "_������"
 
+#: ui/evolution.xml.h:39
 #, fuzzy
-#~ msgid "Print En_velope..."
-#~ msgstr "�������������"
+msgid "_New Folder"
+msgstr "_���� ��������"
 
+#: ui/evolution.xml.h:40
 #, fuzzy
-#~ msgid "Print..."
-#~ msgstr "�������������"
+msgid "_Shortcut Bar"
+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
+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
+msgid "Busy"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Out of Office"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "No Information"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+msgid "_Invite Others..."
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
 #, fuzzy
-#~ msgid "Save _As..."
-#~ msgstr "���������� ��� �������..."
+msgid "_Options"
+msgstr "�_��������"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+msgid "Show _Only Working Hours"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+msgid "Show _Zoomed Out"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+msgid "_Update Free/Busy"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+msgid "_<<"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+msgid "_Autopick"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+msgid ">_>"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+msgid "_All People and Resources"
+msgstr ""
 
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+msgid "All _People and One Resource"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+msgid "_Required People"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+msgid "Required People and _One Resource"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
 #, fuzzy
-#~ msgid "_File"
-#~ msgstr "_��������"
+msgid "Meeting _start time:"
+msgstr "��_���� ����������"
 
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
 #, fuzzy
-#~ msgid "_Print..."
-#~ msgstr "�������������"
+msgid "Meeting _end time:"
+msgstr "��_���� ����������"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+msgid "All Attendees"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:177
+msgid "_Current View"
+msgstr ""
 
+#: widgets/menus/gal-view-menus.c:196
+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
+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
 #, fuzzy
-#~ msgid "C_lear"
-#~ msgstr "����������"
+msgid "Now"
+msgstr "_���"
+
+#: widgets/misc/e-cell-date-edit.c:242
+msgid "OK"
+msgstr ""
+
+#: widgets/misc/e-cell-date-edit.c:723
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr ""
 
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr ""
+
+#: widgets/misc/e-filter-bar.c:166
 #, fuzzy
-#~ msgid "C_ut"
-#~ msgstr "����"
+msgid "Save Search"
+msgstr "�� ���������� ���"
 
+#: widgets/misc/e-filter-bar.c:237
 #, fuzzy
-#~ msgid "Close this appointment"
-#~ msgstr "�������� �������� ���������"
+msgid "Advanced Search"
+msgstr "��������� ��� �������������"
 
-#~ msgid "Copy"
-#~ msgstr "���������"
+#: widgets/misc/e-filter-bar.c:317
+#, fuzzy
+msgid "Advanced ..."
+msgstr "��������� ��� �������������"
 
-#~ msgid "Cut"
-#~ msgstr "����"
+#: widgets/misc/e-messagebox.c:152
+msgid "Information"
+msgstr ""
 
-#, fuzzy
-#~ msgid "FIXME: _New Appointment"
-#~ msgstr "�_�������"
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr ""
 
-#~ msgid "Paste"
-#~ msgstr "����������"
+#: widgets/misc/e-messagebox.c:173
+msgid "Question"
+msgstr ""
 
+#: widgets/misc/e-messagebox.c:180
 #, fuzzy
-#~ msgid "Paste the clipboard"
-#~ msgstr "���������� ������������ ��� �� ��������"
+msgid "Message"
+msgstr "��������� ���������"
 
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:224
 #, fuzzy
-#~ msgid "Print S_etup..."
-#~ msgstr "�������������"
+msgid "Don't show this message again."
+msgstr "�������� �������� ���������"
 
+#: widgets/misc/e-search-bar.c:148
+msgid "Sear_ch"
+msgstr ""
+
+#: views/addressbook/galview.xml.h:1
+msgid "Adress Cards"
+msgstr ""
+
+#: views/addressbook/galview.xml.h:2
 #, fuzzy
-#~ msgid "Properties"
-#~ msgstr "���������"
+msgid "By Company"
+msgstr "���������"
+
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr ""
 
+#: views/mail/galview.xml.h:1
 #, fuzzy
-#~ msgid "Redo"
-#~ msgstr "��������"
+msgid "By Sender"
+msgstr "��������"
 
+#: views/mail/galview.xml.h:2
 #, fuzzy
-#~ msgid "Replace"
-#~ msgstr "������"
+msgid "By Status"
+msgstr "��������� ��������"
 
-#~ msgid "Undo"
-#~ msgstr "�������"
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "����"
 
+#: views/mail/galview.xml.h:4
 #, fuzzy
-#~ msgid "Undo the last action"
-#~ msgstr "������� ���������� �����������"
+msgid "Messages"
+msgstr "��������� ���������"
 
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr ""
+
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
-#~ msgid "_Copy"
-#~ msgstr "���������"
+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 "_Find..."
-#~ msgstr "�������������"
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 
+#: wombat/wombat.c:185
 #, fuzzy
-#~ msgid "_Help"
-#~ msgstr "������_��"
+msgid "init_corba(): could not initialize GNOME"
+msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 
+#: wombat/wombat.c:198
 #, fuzzy
-#~ msgid "_Paste"
-#~ msgstr "����������"
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 
 #, fuzzy
-#~ msgid "_Print"
-#~ msgstr "�������������"
+#~ msgid "New"
+#~ msgstr "_���"
 
 #, fuzzy
-#~ msgid "_Properties..."
-#~ msgstr "���������"
+#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
 #, fuzzy
-#~ msgid "_Undo"
-#~ msgstr "�������"
+#~ msgid "Notes Component: Could not initialize bonobo"
+#~ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 
 #, fuzzy
-#~ msgid "Compose a new message"
-#~ msgstr "�������� ���� ���������"
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr ""
+#~ "�������� �������� ���� ��� �������� ��������� ��������� �� PersistStream ��� "
+#~ "�� ������"
 
 #, fuzzy
-#~ msgid "Copy message to a new folder"
-#~ msgstr "���������� ��� ��������� ���� ����������� �������"
+#~ msgid "Evolution Calendar Conduit"
+#~ msgstr "�_����� ������������ ��� Evolution"
 
 #, fuzzy
-#~ msgid "F_older"
-#~ msgstr "_��������"
+#~ msgid "Evolution ToDo Conduit"
+#~ msgstr "�_����� ������������ ��� Evolution"
 
 #, fuzzy
-#~ msgid "Get Mail"
-#~ msgstr "_������"
+#~ msgid "Open..."
+#~ msgstr "����_���"
 
 #, fuzzy
-#~ msgid "Hide _Deleted messages"
+#~ msgid "Enter the identity you wish to send this message from"
 #~ msgstr "�������� ��� ��������� ��� ���������"
 
+#~ msgid "Enter the subject of the mail"
+#~ msgstr "�������� �� ���� ��� ���������"
+
 #, fuzzy
-#~ msgid "Hide _Read messages"
-#~ msgstr "�������� �������� ���������"
+#~ msgid "Saving changes to message..."
+#~ msgstr "�������� ��� ���������"
 
 #, fuzzy
-#~ msgid "Hide _Selected messages"
-#~ msgstr "�������� ��� ��������� ��� ���������"
+#~ msgid "Save changes to message..."
+#~ msgstr "�������� ��� ���������"
 
 #, fuzzy
-#~ msgid "Mail _Filters..."
+#~ msgid "Edit Filter Rule"
 #~ msgstr "_��������"
 
 #, fuzzy
-#~ msgid "Move"
-#~ msgstr "_������"
+#~ msgid "Remove action"
+#~ msgstr "�������� ������"
 
 #, fuzzy
-#~ msgid "Move message to a new folder"
-#~ msgstr "���������� ��� ��������� ���� ����������� �������"
+#~ msgid "Remove criterion"
+#~ msgstr "�������� ������"
 
 #, fuzzy
-#~ msgid "Print Preview of message..."
-#~ msgstr "�������� ��� ��������� ��� ���������"
+#~ msgid "Add Rule"
+#~ msgstr "��� ����������"
 
 #, fuzzy
-#~ msgid "Print message..."
-#~ msgstr "����������� ��������"
+#~ msgid "Edit VFolder Rule"
+#~ msgstr "_��������"
 
 #, fuzzy
-#~ msgid "Show _All messages"
-#~ msgstr "����������� ��������"
+#~ msgid "Subject contains"
+#~ msgstr "����"
 
 #, fuzzy
-#~ msgid "_Apply Filters"
-#~ msgstr "_��������"
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "�_�������"
 
 #, fuzzy
-#~ msgid "_Copy to Folder..."
-#~ msgstr "���������� ��� �������..."
+#~ msgid "FIXME: Meeting Re_quest"
+#~ msgstr "����_�� ������������"
 
 #, fuzzy
-#~ msgid "_Edit Message"
-#~ msgstr "�������� ��� ���������"
+#~ msgid "FIXME: _Contact"
+#~ msgstr "_��������"
 
 #, fuzzy
-#~ msgid "_Message"
-#~ msgstr "��������� ���������"
+#~ msgid "FIXME: Task _Request"
+#~ msgstr "����_�� ������������"
 
 #, fuzzy
-#~ msgid "_Move to Folder..."
-#~ msgstr "���������� ��� �������..."
+#~ msgid "FIXME: _Journal Entry"
+#~ msgstr "���������� �����_������"
 
 #, fuzzy
-#~ msgid "_Open in New Window"
-#~ msgstr "������� �� ��� ��������"
+#~ msgid "FIXME: Define Print _Styles..."
+#~ msgstr "��_���� ����������"
 
 #, fuzzy
-#~ msgid "_Print Message"
-#~ msgstr "����������� ��������"
+#~ msgid "FIXME: Save Attac_hments..."
+#~ msgstr "��� ���������..."
 
 #, fuzzy
-#~ msgid "_Source"
-#~ msgstr "��� ����������"
+#~ msgid "_Object"
+#~ msgstr "����"
 
 #, fuzzy
-#~ msgid "_Virtual Folder Editor..."
-#~ msgstr "_��������"
+#~ msgid "FIXME: __Formatting"
+#~ msgstr "_��������"
 
-#~ msgid "Attach"
-#~ msgstr "���������"
+#, fuzzy
+#~ msgid "_Toolbars"
+#~ msgstr "�_�������"
 
 #, fuzzy
-#~ msgid "Close the current file"
-#~ msgstr "�������� ���� ��� �������� ������������"
+#~ msgid "_Forms"
+#~ msgstr "���"
 
 #, fuzzy
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "�������� ��� ���������"
+#~ msgid "FIXME: _New Contact"
+#~ msgstr "_��������"
 
 #, fuzzy
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "��������� ������� ��� ������"
+#~ msgid "FIXME: New _Letter to Contact"
+#~ msgstr "_��������"
 
 #, fuzzy
-#~ msgid "Open a file"
-#~ msgstr "������� ��������"
+#~ msgid "FIXME: New Meetin_g with Contact"
+#~ msgstr "_��������"
 
 #, fuzzy
-#~ msgid "Save As"
-#~ msgstr "����������"
+#~ msgid "FIXME: _Plan a Meeting..."
+#~ msgstr "_��������"
 
 #, fuzzy
-#~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "���������� ��� �������..."
+#~ msgid "FIXME: New _Task for Contact"
+#~ msgstr "_��������"
 
 #, fuzzy
-#~ msgid "Save in folder..."
-#~ msgstr "���������� ��� �������..."
+#~ msgid "FIXME: New _Journal Entry for Contact"
+#~ msgstr "���������� �����_������"
 
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "���������� ��� ��������� ���� ����������� �������"
+#, fuzzy
+#~ msgid "FIXME: _Display Map of Address"
+#~ msgstr "_������"
 
-#~ msgid "Send"
-#~ msgstr "��������"
+#, fuzzy
+#~ msgid "FIXME: _Open Web Page"
+#~ msgstr "_������"
 
 #, fuzzy
-#~ msgid "Send the message later"
-#~ msgstr "�������� ��� ���������"
+#~ msgid "FIXME: Next"
+#~ msgstr "_��������"
 
 #, fuzzy
-#~ msgid "Send the message now"
-#~ msgstr "�������� ��� ���������"
+#~ msgid "_Mail"
+#~ msgstr "_������"
 
 #, fuzzy
-#~ msgid "Send this message now"
-#~ msgstr "�������� �������� ���������"
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "����"
 
 #, fuzzy
-#~ msgid "Show / hide attachments"
-#~ msgstr "��������/�������� �����������"
+#~ msgid "Optional"
+#~ msgstr "�_��������"
 
 #, fuzzy
-#~ msgid "Show _attachments"
-#~ msgstr "�������� �������_����"
+#~ msgid "Add News Server"
+#~ msgstr "��� �����"
 
 #, fuzzy
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "�������� �������� ���������"
+#~ msgid "Mail Sources"
+#~ msgstr "������ ������������"
 
 #, fuzzy
-#~ msgid "_Open..."
-#~ msgstr "����_���"
+#~ msgid "News Sources"
+#~ msgstr "��� ����������"
 
 #, fuzzy
-#~ msgid "Evolution bar _shortcut"
-#~ msgstr "�_����� ������������ ��� Evolution"
+#~ msgid "_Print Contacts..."
+#~ msgstr "� ��������� ��������� ���"
 
 #, fuzzy
-#~ msgid "Show the _Folder Bar"
-#~ msgstr "�������� ��� ������ ������������"
+#~ msgid "Ca_lendar"
+#~ msgstr "����������"
 
 #, fuzzy
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "�������� ��� ������ ������������"
+#~ msgid "Open a calendar"
+#~ msgstr "�� ���������� ���"
 
 #, fuzzy
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "�_�������"
+#~ msgid "_Print this calendar"
+#~ msgstr "�� ���������� ���"
 
 #, fuzzy
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "_��������"
+#~ msgid "FIXME: _New Appointment"
+#~ msgstr "�_�������"
 
-#~ msgid "_Folder"
-#~ msgstr "_��������"
+#, fuzzy
+#~ msgid "_Find..."
+#~ msgstr "�������������"
 
 #, fuzzy
-#~ msgid "_Go to Folder..."
-#~ msgstr "���������� ��� �������..."
+#~ msgid "_Undo"
+#~ msgstr "�������"
 
 #, fuzzy
-#~ msgid "_Mail message (FIXME)"
-#~ msgstr "_������"
+#~ msgid "_Print Message"
+#~ msgstr "����������� ��������"
 
 #, fuzzy
-#~ msgid "_Settings"
-#~ msgstr "�_��������"
+#~ msgid "_Source"
+#~ msgstr "��� ����������"
 
 #, fuzzy
-#~ msgid "Appointments:"
-#~ msgstr "�_�������"
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "�������� ��� ������ ������������"
 
 #, fuzzy
 #~ msgid "monday"
@@ -5713,18 +9176,6 @@ msgstr ""
 #~ msgstr "������ ������������"
 
 #, fuzzy
-#~ msgid "Send \"%s\""
-#~ msgstr "�_��������"
-
-#, fuzzy
-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "���������� ��� ��������� ���� ����������� �������"
-
-#, fuzzy
-#~ msgid "Mark messages in folder \"%s\""
-#~ msgstr "���������� ��� ��������� ���� ����������� �������"
-
-#, fuzzy
 #~ msgid "Forward message \"%s\""
 #~ msgstr "�������� �������� ���������"
 
@@ -5733,28 +9184,9 @@ msgstr ""
 #~ msgstr "��� ��������"
 
 #, fuzzy
-#~ msgid "Saving messages from folder \"%s\""
-#~ msgstr "���������� ��� ��������� ���� ����������� �������"
-
-#, fuzzy
-#~ msgid "Save messages from folder \"%s\""
-#~ msgstr "���������� ��� ��������� ���� ����������� �������"
-
-#, fuzzy
 #~ msgid "Rebuild message view"
 #~ msgstr "��� ��������"
 
-#~ msgid "_Actions"
-#~ msgstr "�_��������"
-
-#, fuzzy
-#~ msgid "_Save Calendar As"
-#~ msgstr "����������"
-
-#, fuzzy
-#~ msgid "_New Contact"
-#~ msgstr "_��������"
-
 #, fuzzy
 #~ msgid "Gnome Calendar"
 #~ msgstr "����������"
@@ -5764,18 +9196,10 @@ msgstr ""
 #~ msgstr "�_�������"
 
 #, fuzzy
-#~ msgid "About Calendar"
-#~ msgstr "�� ���������� ���"
-
-#, fuzzy
 #~ msgid "'s calendar"
 #~ msgstr "�� ���������� ���"
 
 #, fuzzy
-#~ msgid "Change"
-#~ msgstr "����������"
-
-#, fuzzy
 #~ msgid "To-do list"
 #~ msgstr "�_�������"
 
@@ -5828,14 +9252,6 @@ msgstr ""
 #~ msgstr "�������� ���� ���������"
 
 #, fuzzy
-#~ msgid "Task _Request (FIXME)"
-#~ msgstr "����_�� ������������"
-
-#, fuzzy
-#~ msgid "_Journal Entry (FIXME)"
-#~ msgstr "���������� �����_������"
-
-#, fuzzy
 #~ msgid "Cannot initialize the configuration system."
 #~ msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
@@ -5882,12 +9298,6 @@ msgstr ""
 #~ msgid "The %s component doesn't support PersistStream!\n"
 #~ msgstr "� ������ %s ��� ����������� �� PersistStream!\n"
 
-#~ msgid "A folder containing mail items"
-#~ msgstr "�������� ��� �������� ��������"
-
-#~ msgid "A folder containing contacts"
-#~ msgstr "�������� ��� �������� ���������"
-
 #~ msgid "A folder containing calendar entries"
 #~ msgstr "�������� ��� �������� �������� �����������"
 
@@ -5906,9 +9316,6 @@ msgstr ""
 #~ msgid "Rename Shortcut"
 #~ msgstr "����������� �����������"
 
-#~ msgid "Executive Summary"
-#~ msgstr "��������"
-
 #~ msgid "Tasks list"
 #~ msgstr "��������� ������������"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 7be1b22d4d..bb5c3d412b 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,11 +2,10 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Robert Brady <rwb197@zepler.org> 2000
 #
-#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
+"POT-Creation-Date: 2001-04-14 08:51-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -14,363 +13,197 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: 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 "Could not initialise Bonobo"
-
-#: addressbook/gui/widgets/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:101
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr ""
-
-#: 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
-#, c-format
-msgid "No such message: %s"
-msgstr ""
-
-#: 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
-#, c-format
-msgid "Send an email to %s"
-msgstr ""
-
-#: 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 "Colours"
-
-#: executive-summary/component/e-summary-url.c:68
-#, c-format
-msgid "Move %s to the left"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Configure %s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:919
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:933
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-
-#: 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"
-msgstr ""
-
-#: notes/component-factory.c:27
-msgid "New"
-msgstr ""
-
-#: notes/component-factory.c:27
-msgid "Create a new note"
-msgstr ""
-
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Could not initialise Bonobo"
-
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3209
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3211
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3212
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3054
+#: addressbook/backend/ebook/e-card.c:3214
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3215
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3070
+#: addressbook/backend/ebook/e-card.c:3230
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3241
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3243
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3244
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3245
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3246
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3247
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3248
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3249
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3102
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3117
+#: addressbook/backend/ebook/e-card.c:3277
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3301
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3144
+#: addressbook/backend/ebook/e-card.c:3304
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3163
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3169
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3177
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3341
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3355
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3196
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3357
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3362
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3203
+#: addressbook/backend/ebook/e-card.c:3363
 msgid ""
 "\n"
 "Comment: "
@@ -386,132 +219,37 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3376
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3219
+#: addressbook/backend/ebook/e-card.c:3379
 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"
-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 "Synchronise"
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
+msgid "Factory to import GnomeCard files into Evolution."
 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/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
+msgid "Imports GnomeCard files into Evolution."
 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:"
-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>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-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
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-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 ""
-
-#: 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 "Synchronise Action"
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
+#: 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
+msgid "Could not initialize Bonobo"
+msgstr "Could not initialise Bonobo"
 
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
@@ -521,346 +259,425 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:655
+#: calendar/conduits/calendar/calendar-conduit.c:732
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
+#: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:690
 msgid "Could not read pilot's Address application block"
 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
-msgid "_Add"
+#: 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"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-msgid "_Delete"
+#: addressbook/contact-editor/contact-editor.glade.h:2
+msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
+#: addressbook/contact-editor/contact-editor.glade.h:3
+msgid "B_usiness"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
+#: addressbook/contact-editor/contact-editor.glade.h:4
+msgid "Business _Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
+#: 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
+msgid "Ca_tegories..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
+#: addressbook/contact-editor/contact-editor.glade.h:7
 msgid "Contact Editor"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
+#: addressbook/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+msgid "Details"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
+#: addressbook/contact-editor/contact-editor.glade.h:9
 msgid "File As:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
+#: addressbook/contact-editor/contact-editor.glade.h:10
+#: executive-summary/component/executive-summary-config.glade.h:3
+msgid "General"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
+#: addressbook/contact-editor/contact-editor.glade.h:11
+msgid "New phone type"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
+#: addressbook/contact-editor/contact-editor.glade.h:12
+msgid "No_tes:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
+#: addressbook/contact-editor/contact-editor.glade.h:13
+msgid "Phone Types"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
+#: addressbook/contact-editor/contact-editor.glade.h:14
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "Primary Email"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
+#: addressbook/contact-editor/contact-editor.glade.h:15
+msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
+#: addressbook/contact-editor/contact-editor.glade.h:16
+msgid "Web page address:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
+#: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:74
+msgid "_Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
+#: addressbook/contact-editor/contact-editor.glade.h:18
+msgid "_Address..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
+#: addressbook/contact-editor/contact-editor.glade.h:19
+msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
+#: addressbook/contact-editor/contact-editor.glade.h:20
+msgid "_Birthday:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
+#: addressbook/contact-editor/contact-editor.glade.h:21
+msgid "_Business"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/contact-editor/contact-editor.glade.h:22
 msgid "_Company:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
+#: 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"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
+#: addressbook/contact-editor/contact-editor.glade.h:24
+msgid "_Department:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
+#: addressbook/contact-editor/contact-editor.glade.h:25
+msgid "_Full Name..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
+#: addressbook/contact-editor/contact-editor.glade.h:26
+msgid "_Home"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
+#: addressbook/contact-editor/contact-editor.glade.h:27
+msgid "_Job title:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
+#: addressbook/contact-editor/contact-editor.glade.h:28
+msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
+#: addressbook/contact-editor/contact-editor.glade.h:29
+msgid "_Mobile"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
+#: addressbook/contact-editor/contact-editor.glade.h:30
+msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
+#: addressbook/contact-editor/contact-editor.glade.h:31
+msgid "_Office:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
+#: addressbook/contact-editor/contact-editor.glade.h:32
+msgid "_Profession:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
+#: addressbook/contact-editor/contact-editor.glade.h:33
+msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
+#: addressbook/contact-editor/contact-editor.glade.h:34
+msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:603
+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/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/widgets/e-addressbook-view.c:676
 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/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1310
 msgid "Business"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/contact-editor/e-contact-editor.c:1244
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "Car"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1248
 msgid "Company"
 msgstr ""
 
-#: 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/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1311
 msgid "Home"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/contact-editor/e-contact-editor.c:1250
 msgid "Home 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Home Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/contact-editor/e-contact-editor.c:1253
 msgid "Mobile"
 msgstr ""
 
-#: 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/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"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:662
 msgid "Other Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Pager"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
+#: addressbook/contact-editor/e-contact-editor.c:1257
 msgid "Primary"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/gui/widgets/e-addressbook-view.c:664
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/widgets/e-addressbook-view.c:665
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/contact-editor/e-contact-editor.c:1260
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: 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:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/gui/widgets/e-addressbook-view.c:669
 msgid "Email 3"
 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/fullname-strings.h:7
+#: addressbook/contact-editor/e-contact-quick-add.c:223
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:225
+msgid "Edit Full"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/widgets/e-addressbook-view.c:643
+msgid "Full Name"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:268
+msgid "E-mail"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:2
+msgid "Canada"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:3
+msgid "Check Address"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:5
+msgid "Finland"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:6
+msgid "USA"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:7
+msgid "_Address:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:8
+msgid "_City:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:9
+msgid "_PO Box:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:10
+msgid "_State/Province:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:11
+msgid "_ZIP Code:"
+msgstr "_Post Code:"
+
+#: addressbook/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:8
-#, fuzzy
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
+#: addressbook/contact-editor/fullname.glade.h:2
+msgid "Dr."
 msgstr ""
-"\n"
-"Mr\n"
-"Ms\n"
-"Miss\n"
-"Mrs\n"
-"Dr\n"
-"Prof\n"
-"Rev\n"
 
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
+#: addressbook/contact-editor/fullname.glade.h:3
+msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
+#: addressbook/contact-editor/fullname.glade.h:4
+msgid "I"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
+#: addressbook/contact-editor/fullname.glade.h:5
+msgid "II"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:25
-msgid "_Middle:"
+#: addressbook/contact-editor/fullname.glade.h:6
+msgid "III"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:26
+#: addressbook/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:8
+msgid "Miss"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:12
+msgid "Sr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:13
+msgid "_First:"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:27
+#: addressbook/contact-editor/fullname.glade.h:15
+msgid "_Middle:"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:231
+#: addressbook/contact-editor/fullname.glade.h:17
+msgid "_Title:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:241
 msgid "As _Minicards"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:247
+#: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:374
+#: addressbook/gui/component/addressbook.c:399
 #, c-format
 msgid "Enter password for %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:402
+#: addressbook/gui/component/addressbook.c:427
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:407
+#: 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"
@@ -872,206 +689,565 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:555
 msgid "Show All"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
+#: addressbook/gui/component/addressbook.c:557
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:587
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:563
+#: addressbook/gui/component/addressbook.c:588
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:564
+#: addressbook/gui/component/addressbook.c:589
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:707
+#: addressbook/gui/component/addressbook.c:732
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:95
+#: addressbook/gui/component/addressbook-storage.c:99
 msgid "Other Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:139
+#: addressbook/gui/component/addressbook-config.c:148
 msgid "LDAP Server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:141
+#: addressbook/gui/component/addressbook-config.c:150
 msgid "File"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/component/addressbook-config.c:153
 msgid "Unknown addressbook type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/component/addressbook-config.c:163
 msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
+#: 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-store.c:146
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
 msgid "Password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:157
+#: addressbook/gui/component/addressbook-config.c:167
 msgid "SASL"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
+#: addressbook/gui/component/addressbook-config.c:170
 msgid "Unknown auth type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:169
+#: addressbook/gui/component/addressbook-config.c:179
 msgid "Base"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:171
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:173
+#: addressbook/gui/component/addressbook-config.c:183
 msgid "Subtree"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:186
 msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:309
+#: addressbook/gui/component/addressbook-config.c:353
 msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:311
+#: 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:360
+#: addressbook/gui/component/addressbook-config.c:406
+#: mail/mail-config.glade.h:28
 msgid "Host:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:361
+#: 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:364
+#: 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:384
+#: 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:438
+#: addressbook/gui/component/addressbook-config.c:489
 msgid "Authentication:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:455
+#: addressbook/gui/component/addressbook-config.c:507
+#: mail/mail-config.glade.h:44
 msgid "Path:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:460
+#: 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:593
+#: addressbook/gui/component/addressbook-config.c:647
 msgid "Edit Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:595
+#: addressbook/gui/component/addressbook-config.c:649
 msgid "Add Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:611
+#: 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:616
+#: addressbook/gui/component/addressbook-config.c:671
+#: mail/mail-config.glade.h:35
 msgid "Name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:617
+#: 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/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
+#: 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: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
+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 ""
+
+#: 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
+#, 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/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 "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/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: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
+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:158
 msgid "Search"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
+#: addressbook/gui/widgets/alphabet.glade.h:1
+msgid "123"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:2
+msgid "a"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:3
+msgid "b"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:4
+msgid "c"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:5
+msgid "d"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:6
+msgid "e"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:7
+msgid "f"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:8
+msgid "g"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:9
+msgid "h"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:10
+msgid "i"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:11
+msgid "j"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:12
+msgid "k"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:13
+msgid "l"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:14
+msgid "m"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:15
+msgid "n"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:16
+msgid "o"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:17
+msgid "p"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:18
+msgid "q"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:19
+msgid "r"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:20
+msgid "s"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:21
+msgid "t"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:22
+msgid "u"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:23
+msgid "v"
+msgstr ""
+
+#: 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-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
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-msgid "Name"
+#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-minicard.c:669
+msgid "Send contact to other"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-minicard.c:670
+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
+msgid "Print"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-minicard.c:672
+msgid "Print Envelope"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:641
+msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:566
+#: addressbook/gui/widgets/e-addressbook-view.c:642
+msgid "File As"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:644
 msgid "Email"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:645
+msgid "Primary Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:646
+msgid "Assistant Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:647
+msgid "Business Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:648
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:649
+msgid "Company Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:650
+msgid "Home Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:651
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/gui/widgets/e-addressbook-view.c:652
+msgid "Business Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:653
+msgid "Home Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:654
+msgid "Mobile Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:658
+msgid "Business Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:659
+msgid "Home Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:661
+msgid "Other Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:666
+msgid "TTY"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:667
+msgid "Other Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:670
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:671
 msgid "Department"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/gui/widgets/e-addressbook-view.c:672
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Title"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/gui/widgets/e-addressbook-view.c:674
 msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/gui/widgets/e-addressbook-view.c:675
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:678
 msgid "Spouse"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:679
 msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-minicard-control.c:282
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:129
+#: addressbook/gui/widgets/e-minicard-view.c:166
 msgid ""
 "\n"
 "\n"
@@ -1080,439 +1256,1250 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+msgid "Card View"
 msgstr ""
 
-#: 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:1
+msgid "10 pt. Tahoma"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
-msgid "Error while communicating with calendar server"
+#: addressbook/printing/e-contact-print.glade.h:2
+msgid "8 pt. Tahoma"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
-msgid "Could not read pilot's Calendar application block"
+#: addressbook/printing/e-contact-print.glade.h:3
+msgid "Blank forms at end:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
+#: addressbook/printing/e-contact-print.glade.h:4
+msgid "Body"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
+#: addressbook/printing/e-contact-print.glade.h:5
+msgid "Bottom:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
+#: addressbook/printing/e-contact-print.glade.h:6
+msgid "Dimensions:"
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
+#: addressbook/printing/e-contact-print.glade.h:7
+msgid "Font..."
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:876
-msgid "Snooze"
+#: addressbook/printing/e-contact-print.glade.h:8
+msgid "Fonts"
 msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
+#: addressbook/printing/e-contact-print.glade.h:9
+msgid "Footer:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
+#: addressbook/printing/e-contact-print.glade.h:10
+msgid "Format"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:269
-msgid "Open calendar"
+#: addressbook/printing/e-contact-print.glade.h:11
+msgid "Header"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:311
-msgid "Save calendar"
+#: addressbook/printing/e-contact-print.glade.h:12
+msgid "Header/Footer"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:448
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: addressbook/printing/e-contact-print.glade.h:13
+msgid "Headings"
 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"
+#: addressbook/printing/e-contact-print.glade.h:14
+msgid "Headings for each letter"
 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"
+#: addressbook/printing/e-contact-print.glade.h:15
+msgid "Height:"
 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"
+#: 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
+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 ""
+
+#: addressbook/printing/e-contact-print.glade.h:23
+msgid "Options"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:24
+#, fuzzy
+msgid "Orientation"
+msgstr "Organisation"
+
+#: addressbook/printing/e-contact-print.glade.h:25
+msgid "Page"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:26
+msgid "Page Setup:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:27
+msgid "Paper"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:28
+msgid "Paper source:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:29
+msgid "Portrait"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:30
+msgid "Preview:"
+msgstr ""
+
+#: 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
+msgid "Right:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:34
+msgid "Sections:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:35
+msgid "Shading"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:36
+msgid "Size:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:37
+msgid "Start on a new page"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:38
+msgid "Style name:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:39
+msgid "Top:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:40
+msgid "Type:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:41
+msgid "Width:"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:687
+#: calendar/conduits/todo/todo-conduit.c:501
+msgid "Error while communicating with calendar server"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:786
+#: calendar/conduits/calendar/calendar-conduit.c:789
+msgid "Could not read pilot's Calendar application block"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
+msgid "Could not read pilot's ToDo application block"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:266
+msgid "File not found"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:374
+#: calendar/gui/calendar-commands.c:290
+msgid "Open calendar"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:332
+msgid "Save calendar"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:468
+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
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:377
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
+#: calendar/gui/e-calendar-table.c:331
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:380
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
+#: calendar/gui/e-calendar-table.c:332
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
+#: 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
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:457
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:457
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:459
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:459
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:545
+#: 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
+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
+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
+msgid "Low"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
+#: calendar/gui/e-calendar-table.c:406
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:548
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
+#: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:774
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
+#: 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
+msgid "Not Started"
 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:638 calendar/gui/calendar-model.c:1175
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:427
+msgid "In Progress"
 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:641 calendar/gui/calendar-model.c:1177
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:428
+msgid "Completed"
 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: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
+msgid "Cancelled"
 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"
+#. 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
+msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
+#. 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
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:799
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:879
+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
+msgid "None"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:967
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1007
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
+#: calendar/gui/calendar-model.c:1048
+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
+msgid "Undefined"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1102
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1571
+msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:97
+#: calendar/gui/calendar-model.c:1573
+msgid "Assigned"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1579
+msgid "Yes"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1579
+msgid "No"
+msgstr ""
+
+#: calendar/gui/calendar-summary.c:196
 msgid "%A, %e %B %Y"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
 msgid "%I:%M%p"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:302
+#: calendar/gui/calendar-summary.c:437
 msgid "<b>Error loading calendar</b>"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:314
+#: calendar/gui/calendar-summary.c:449
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:484
+#: calendar/gui/calendar-summary.c:616
 msgid "Display"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:489
+#: calendar/gui/calendar-summary.c:621
 msgid "Show appointments"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:497
+#: calendar/gui/calendar-summary.c:629
 msgid "Show tasks"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:583
+#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr ""
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:126
 msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+#: 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/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+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/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/notify-main.c:67 calendar/gui/main.c:52
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Could not initialise Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:77
+msgid "Could not create the alarm notify service factory"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-notify-dialog.c:189
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
+#: 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-notify-dialog.c:202
+#: calendar/gui/dialogs/alarm-notify-dialog.c:207
 msgid "No summary available."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:63
+#: 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-notify.glade.h:2
+msgid "Edit appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:4
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid "05 minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+msgid "10 minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+msgid "12 hour (am/pm)"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+msgid "15 minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+msgid "24 hour"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+msgid "30 minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+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
+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
+msgid "Calendar"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Calendar Preferences"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+msgid "Colors"
+msgstr "Colours"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Compress weekends"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Date navigator options"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "Defaults"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+msgid "Display options"
+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
+msgid "First day of week:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "Fri"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/event-editor.c:481
+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
+msgid "Mon"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/event-editor.c:477
+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 "Pick a colour"
+
+#: 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
+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
+msgid "Sat"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/event-editor.c:482
+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"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show week numbers"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "Start of day:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Sun"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/event-editor.c:483
+msgid "Sunday"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+msgid "TaskPad"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "Thu"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/event-editor.c:480
+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:49
+msgid "Time divisions:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "Time format:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+msgid "Tue"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:478
+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
+msgid "Wed"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: calendar/gui/event-editor.c:479
+msgid "Wednesday"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+msgid "Work week"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+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/delete-comp.c:70
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:66
+#: calendar/gui/dialogs/delete-comp.c:73
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:72
+#: calendar/gui/dialogs/delete-comp.c:79
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:75
+#: calendar/gui/dialogs/delete-comp.c:82
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:81
+#: calendar/gui/dialogs/delete-comp.c:88
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:84
+#: calendar/gui/dialogs/delete-comp.c:91
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:690
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+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"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: calendar/gui/event-editor-dialog.glade.h:8
+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
+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
+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
+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 ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:28
+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/task-editor-dialog.glade.h:25
+msgid "_Due Date:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+msgid "_Priority:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+msgid "_Status:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:697
 msgid "Edit Task"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:154
+#: calendar/gui/e-calendar-table.c:157
 msgid "Categories"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:155
-msgid "Classification"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:159
 msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:160
 msgid "End Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:161
 msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:163
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
+#: calendar/gui/e-calendar-table.c:164
+msgid "Percent complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:166
 msgid "Summary"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:167
 msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:168
 msgid "URL"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:169
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
+#: calendar/gui/e-calendar-table.c:170
+msgid "Click here to add a task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:384
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:552
 msgid "Mark the task complete"
 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/e-calendar-table.c:557
+msgid "Edit this task..."
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:558
+msgid "Edit the task"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:560
+#: ui/evolution-task-editor-dialog.xml.h:19
+msgid "Delete this task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:561
 msgid "Delete the task"
 msgstr ""
 
-#: 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 ""
 
 #. 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:274 calendar/gui/e-day-view.c:1294
+#: calendar/gui/e-week-view-main-item.c:325
 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
+#: 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 ""
 
 #. 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:282 calendar/gui/e-day-view.c:1321
+#: 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:570 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:617
 msgid "am"
 msgstr ""
 
 #. 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:573 calendar/gui/e-week-view.c:303
+#: calendar/gui/print.c:616
 msgid "pm"
 msgstr ""
 
-#: 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:3146 ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
 msgstr ""
 
-#: 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:3148 calendar/gui/e-week-view.c:3280
+msgid "New All Day Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-msgid "Delete this appointment"
+#: 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:3155 calendar/gui/e-week-view.c:3287
+msgid "Go to Date..."
+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"
+msgstr ""
+
+#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
+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"
+msgstr ""
+
+#: 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:3179
+msgid "Delete all Occurrences"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:161
+msgid "I couldn't update your calendar file!\n"
+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:173
+msgid "There was an error loading the calendar file."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:197
+msgid "I couldn't open your calendar file!\n"
+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 ""
+
+#: calendar/gui/e-itip-control.c:470
+msgid "I couldn't read your calendar file!\n"
+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:499
+msgid "I couldn't update your calendar store."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:540
+msgid "I couldn't delete the calendar component!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:550
+msgid "Component successfully deleted."
+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/e-itip-control.c:780
+msgid "Add to Calendar"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:814
+msgid " Accept "
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
+#: calendar/gui/e-itip-control.c:815
+msgid " Decline "
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
+#: calendar/gui/e-itip-control.c:816
+msgid " Tentative "
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
+#: calendar/gui/e-itip-control.c:860
+msgid "Update Calendar"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
+#: calendar/gui/e-itip-control.c:883
+msgid "Cancel Meeting"
+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
+msgid "Calendar Message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
+msgid "Date:"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:8
+msgid "Loading calendar..."
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:9
+#, fuzzy
+msgid "Organizer:"
+msgstr "Organisation:"
+
+#: 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 ""
+
+#: calendar/gui/e-itip-control.glade.h:13
+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 ""
+
+#: 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
+#, 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
+msgid ""
+"Request\n"
+"Meeting"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:20
+msgid "Required Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:21
+msgid "Role"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:22
+msgid ""
+"Schedule\n"
+"Time"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
+#: mail/message-list.c:1052
+msgid "Status"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
+#: calendar/gui/e-tasks.c:502
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:146
+#: calendar/gui/e-tasks.c:155
 msgid "Category:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:285
+#: calendar/gui/e-tasks.c:298
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:310
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
@@ -1520,559 +2507,1165 @@ 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
+#: calendar/gui/e-week-view-main-item.c:342
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/event-editor.c:331
-msgid "Edit Appointment"
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+msgid "New Appointment..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:409
-msgid "on"
+#: calendar/gui/e-week-view.c:3314
+msgid "Delete All Occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
+#: calendar/gui/event-editor-dialog.glade.h:1
+msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
+#: calendar/gui/event-editor-dialog.glade.h:3
+msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/event-editor.c:436
-msgid "Tuesday"
+#: calendar/gui/event-editor-dialog.glade.h:4
+msgid "Appointment Basics"
 msgstr ""
 
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
+#: calendar/gui/event-editor-dialog.glade.h:7
+msgid "Custom recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor.c:438
-msgid "Thursday"
+#: calendar/gui/event-editor-dialog.glade.h:10
+msgid "Every"
 msgstr ""
 
-#: calendar/gui/event-editor.c:439
-msgid "Friday"
+#: calendar/gui/event-editor-dialog.glade.h:11
+msgid "Exceptions"
 msgstr ""
 
-#: calendar/gui/event-editor.c:440
-msgid "Saturday"
+#: calendar/gui/event-editor-dialog.glade.h:12
+msgid "Modify"
 msgstr ""
 
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
+#: calendar/gui/event-editor-dialog.glade.h:13
+msgid "No recurrence"
+msgstr ""
+
+#: 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 ""
+
+#: 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:22
+#: calendar/gui/event-editor.c:1588
+msgid "Run a program"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor.c:1585
+msgid "Send an email"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
+msgid "Settings..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:561
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor.c:1582
+msgid "Show a dialog"
+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 ""
+
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
+msgid "after"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
+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 mail/mail-config.glade.h:77
+msgid "minute(s)"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:41
+msgid "month(s)"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:42
+msgid "start of appointment"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:43
+msgid "until"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:44
+msgid "week(s)"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:45
+msgid "year(s)"
+msgstr ""
+
+#: calendar/gui/event-editor.c:373
+msgid "Edit Appointment"
+msgstr ""
+
+#: calendar/gui/event-editor.c:451
+msgid "on"
+msgstr ""
+
+#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
+msgid "day"
+msgstr ""
+
+#: calendar/gui/event-editor.c:603
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:568
+#: calendar/gui/event-editor.c:610
 msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:756
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:873
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
+#: calendar/gui/event-editor.c:1534
+#, c-format
+msgid " %d days"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1536
+msgid " 1 day"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1539
+#, c-format
+msgid " %d weeks"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1541
+msgid " 1 week"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1544
+#, c-format
+msgid " %d hours"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1546
+msgid " 1 hour"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1549
+#, c-format
+msgid " %d minutes"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1551
+msgid " 1 minute"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1554
+#, c-format
+msgid " %d seconds"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1556
+msgid " 1 second"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1603
+msgid " before start of appointment"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1605
+msgid " after start of appointment"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1613
+msgid " before end of appointment"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1615
+msgid " after end of appointment"
+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"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:696
+#: 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-cal.c:700
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:707
+#: calendar/gui/gnome-cal.c:711
 #, 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"
+#: calendar/gui/goto-dialog.glade.h:1
+msgid "April"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
+#: calendar/gui/goto-dialog.glade.h:2
+msgid "August"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
+#: calendar/gui/goto-dialog.glade.h:3
+msgid "December"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
+#: calendar/gui/goto-dialog.glade.h:4
+msgid "February"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
+#: calendar/gui/goto-dialog.glade.h:5
+msgid "Go To Date"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
+#: calendar/gui/goto-dialog.glade.h:6
+msgid "Go To Today"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
+#: calendar/gui/goto-dialog.glade.h:7
+msgid "January"
 msgstr ""
 
-#: calendar/gui/main.c:50
-#, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "Could not initialise Bonobo"
+#: calendar/gui/goto-dialog.glade.h:8
+msgid "July"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:9
+msgid "June"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:10
+msgid "March"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:11
+msgid "May"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:12
+msgid "November"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:13
+msgid "October"
+msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/goto-dialog.glade.h:14
+msgid "September"
+msgstr ""
+
+#: calendar/gui/print.c:300
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:300
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:300
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:300
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:300
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:301
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:301
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:301
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:301
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:301
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:302
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:302
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:302
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:302
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:302
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:303
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:303
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:303
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:303
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:303
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:304
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:304
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:304
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:304
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:304
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:305
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:305
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:305
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:305
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:305
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:306
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "Sa"
 msgstr ""
 
-#: calendar/gui/print.c:941
+#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1071
+#: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1086
+#: calendar/gui/print.c:1093
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1097
+#: calendar/gui/print.c:1104
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1105
+#: calendar/gui/print.c:1112
 msgid "Current month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1112
+#: calendar/gui/print.c:1119
 msgid "Current year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1149
+#: calendar/gui/print.c:1156
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
+#: 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
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/tasks-control.c:108
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: 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:169
+msgid "Signing is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:207
+msgid "Clearsigning is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:245
+msgid "Verifying is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:286
+msgid "Encryption is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:326
+msgid "Decryption is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#, fuzzy
+msgid "Syncing folders"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-filter-driver.c:643
+msgid "Unable to open spool folder"
+msgstr ""
+
+#: camel/camel-filter-driver.c:652
+msgid "Unable to process spool folder"
+msgstr ""
+
+#: camel/camel-filter-driver.c:666
+msgid "Getting message %d (%d%%)"
+msgstr ""
+
+#: 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
+msgid "Cannot open message"
+msgstr ""
+
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#, 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
+#, c-format
+msgid "Getting message %d of %d"
+msgstr ""
+
+#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#, c-format
+msgid "Failed at message %d of %d"
+msgstr ""
+
+#: camel/camel-filter-driver.c:866
+#, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr ""
+
+#: camel/camel-filter-driver.c:871
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr ""
+
+#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#, c-format
+msgid "Error executing filter search: %s: %s"
+msgstr ""
+
+#: camel/camel-folder-search.c:328
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-folder-search.c:338
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: 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 ""
+
 #. 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 camel/camel-movemail.c:138
+#: camel/camel-movemail.c:185
 #, 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 camel/camel-movemail.c:219
 #, 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:101
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:148
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:197
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:243
+#: camel/camel-movemail.c:245
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:254
+#: camel/camel-movemail.c:256
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:274
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:304
+#: camel/camel-movemail.c:306
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:318
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:356
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:357
 msgid "(Unknown error)"
 msgstr ""
 
-#: camel/camel-provider.c:133
+#: camel/camel-movemail.c:587
+#, c-format
+msgid "Error copying mail temp file: %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:186
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:189
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr ""
+
+#: camel/camel-pgp-context.c:509
+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
+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
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:681
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:871
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:888
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1011
+msgid "No plaintext to encrypt."
+msgstr ""
+
+#: camel/camel-pgp-context.c:1037
+msgid "No recipients specified"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1227
+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:186
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:188
+#: camel/camel-remote-store.c:190
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:318
+#: camel/camel-remote-store.c:240
 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:243
+#: camel/providers/smtp/camel-smtp-transport.c:261
 #, 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:244
 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:325 camel/camel-remote-store.c:387
+#: camel/camel-remote-store.c:458
+#: camel/providers/imap/camel-imap-command.c:264
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-service.c:137
+#: camel/camel-remote-store.c:464
+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
+msgid "Authentication failed."
+msgstr ""
+
+#: 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:417
+msgid "Bad authentication response from server."
+msgstr ""
+
+#: 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
+#, c-format
+msgid "Regular expression compilation failed: %s: %s"
+msgstr ""
+
+#: camel/camel-service.c:152
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:146
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:168
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:520
+#: camel/camel-service.c:554
+#, c-format
+msgid "Resolving: %s"
+msgstr ""
+
+#: camel/camel-service.c:581
 #, c-format
-msgid "No such host %s."
+msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:523
+#: camel/camel-service.c:606
 #, 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:608
+#, c-format
+msgid "Host lookup failed: %s: unknown reason"
+msgstr ""
+
+#: camel/camel-session.c:57
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/camel-session.c:59
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-session.c:274 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:390
+#: camel/camel-session.c:462
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
+#. 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 ""
 
-#: camel/camel-url.c:90
+#: camel/camel-url.c:289
 #, c-format
-msgid "URL string `%s' contains an invalid protocol"
+msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-url.c:150
+#: camel/camel-vee-folder.c:451
 #, c-format
-msgid "Port number in URL `%s' is non-numeric"
+msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:133
+#: camel/camel-vee-folder.c:545
 #, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
+msgid "No such message: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:209
 #, 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:217
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:272
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:433
+#: camel/providers/imap/camel-imap-command.c:456
 #, 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:490
 #, 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:172
 #, 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:351
+#, fuzzy
+msgid "Scanning IMAP folder"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/imap/camel-imap-folder.c:986
+#: camel/providers/imap/camel-imap-folder.c:1197
+msgid "This message is not currently available"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1016
+#: camel/providers/imap/camel-imap-folder.c:1231
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:39
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+msgid "Checking for new mail"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:45
+msgid "Check for new messages in all folders"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+msgid "Folders"
+msgstr ""
+
+#: 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
+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: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:440
+#, 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."
+#: camel/providers/imap/camel-imap-store.c:450
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, c-format
+msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:361
+#: camel/providers/imap/camel-imap-store.c:475
 #, 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:490
+#: camel/providers/smtp/camel-smtp-transport.c:403
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:518
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2080,302 +3673,321 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:645
+#: 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/local/camel-local-provider.c:36
+#: camel/providers/imap/camel-imap-store.c:1382
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:39
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:40
 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:49
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:50
 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:59
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:122
+#: camel/providers/local/camel-local-store.c:129
 #, 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:136
 #, 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:144
+#: camel/providers/local/camel-local-store.c:160
 #, 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"
+#: camel/providers/local/camel-local-store.c:175
+msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-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:185
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:256
+#: camel/providers/local/camel-local-store.c:241
 #, 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:283
 #, 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:293
 #, 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-maildir-folder.c:150
+#: camel/providers/local/camel-maildir-folder.c:158
+#: camel/providers/local/camel-maildir-folder.c:169
 #, 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: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
 #, 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:197
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
 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:218
+#: camel/providers/local/camel-mh-folder.c:203
 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:96
+#: 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:100
+#: 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:107
+#: 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:122
 #, 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:151
+#: camel/providers/local/camel-maildir-store.c:188
+#: 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:152
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:152
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:203
 #, 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:335
+#: camel/providers/local/camel-mbox-folder.c:367
+#: camel/providers/local/camel-mbox-folder.c:380
 #, 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:368
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:381
 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:248
+#, fuzzy
+msgid "Summarising folder"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/local/camel-mbox-summary.c:253
 #, 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:295
 #, 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:370
 #, 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:501
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+#, fuzzy
+msgid "Synchronising folder"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/local/camel-mbox-summary.c:506
+#: camel/providers/local/camel-mbox-summary.c:707
 #, 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:523
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: 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: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
 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:599
 #, 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:616
 #, 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:634
+#: camel/providers/local/camel-mbox-summary.c:803
 #, 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:643
 #, 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:654
 #, 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
 #, 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:149
+#: camel/providers/local/camel-mh-folder.c:157
 #, 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/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:66
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:72
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:81
 msgid "Server rejected username/password"
 msgstr ""
 
@@ -2399,11 +4011,11 @@ msgstr ""
 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 ""
 
@@ -2429,529 +4041,932 @@ msgstr ""
 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
+msgid "Retrieving POP summary"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:192
 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:285
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:288
+#: camel/providers/pop3/camel-pop3-folder.c:289
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:307
 #, 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
+msgid "Message storage"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Leave messages on server"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:41
+#, c-format
+msgid "Delete after %s day(s)"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
 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:207
 #, 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:319
 #, 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:358
 #, 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:377
 #, 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:380
+#: camel/providers/pop3/camel-pop3-store.c:417
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:424
+#: camel/providers/pop3/camel-pop3-store.c:407
 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:415
 #, 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:483
 #, 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:57
 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 ""
 
-#: 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
+msgid "Could not find 'From' address in message"
+msgstr ""
+
+#: 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:52
+msgid "SMTP"
+msgstr ""
+
+#: 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:165
+msgid "Syntax error, command unrecognized"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:167
+msgid "Syntax error in parameters or arguments"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Command not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:171
+msgid "Command parameter not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:173
+msgid "System status, or system help reply"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:175
+msgid "Help message"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:177
+msgid "Service ready"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:179
+msgid "Service closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:181
+msgid "Service not available, closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:183
+msgid "Requested mail action okay, completed"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:185
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
+msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:279
-msgid "No authentication required"
+#: camel/providers/smtp/camel-smtp-transport.c:187
+msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: 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:189
+msgid "Requested action not taken: mailbox unavailable"
 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:191
+msgid "Requested action aborted: error in processing"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:193
+msgid "User not local; please try <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:195
+msgid "Requested action not taken: insufficient system storage"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:197
+msgid "Requested mail action aborted: exceeded storage allocation"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:199
+msgid "Requested action not taken: mailbox name not allowed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:201
+msgid "Start mail input; end with <CRLF>.<CRLF>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:203
+msgid "Transaction failed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:207
+msgid "A password transition is needed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:209
+msgid "Authentication mechanism is too weak"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:211
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:213
+msgid "Temporary authentication failure"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:215
+msgid "Authentication required"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:305
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:348
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:388
+#, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
+#: camel/providers/smtp/camel-smtp-transport.c:411
+#, 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:527
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:322
+#: camel/providers/smtp/camel-smtp-transport.c:529
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:347
+#: camel/providers/smtp/camel-smtp-transport.c:554
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:561
 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
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:462
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, 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:688
 #, 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:721
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:736
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, c-format
+msgid "AUTH request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:798
+msgid "Bad authentication response from server.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:824
 #, 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:843
 #, 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:868
 #, 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:887
+#, 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:918
 #, 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:937
 #, 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:952
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:989
 #, 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:1013
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:709
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:732
+#: camel/providers/smtp/camel-smtp-transport.c:1055
 #, 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:1074
 #, 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:95
 msgid "1 byte"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:97
 #, c-format
 msgid "%u bytes"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.1fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:112
 #, c-format
 msgid "%.1fG"
 msgstr ""
 
 #. 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:332 mail/mail-display.c:120
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:413
+#: 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:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:461
+#: composer/e-msg-composer-attachment-bar.c:469
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:501
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
-#: mail/mail-format.c:624
-msgid "From:"
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
+msgid "Attachment"
+msgstr ""
+
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Attachment properties"
+msgstr ""
+
+#: composer/e-msg-composer-attachment.glade.h:4
+msgid "File name:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:257
+#: composer/e-msg-composer-attachment.glade.h:5
+msgid "Inline attachment"
+msgstr ""
+
+#: composer/e-msg-composer-attachment.glade.h:6
+msgid "MIME type:"
+msgstr ""
+
+#: composer/e-msg-composer-attachment.glade.h:7
+msgid "Send as:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:321
 msgid "Click here for the address book"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:313
-msgid "Enter the identity you wish to send this message from"
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
+msgid "From:"
+msgstr ""
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
+msgid "Reply-To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
+msgid "Subject:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:318
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:388
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:329
+#: composer/e-msg-composer-hdrs.c:392
 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-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr ""
-
-#: composer/e-msg-composer.c:430
+#: composer/e-msg-composer.c:528
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:598
+#: composer/e-msg-composer.c:716
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:609
+#: composer/e-msg-composer.c:727
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:629
+#: composer/e-msg-composer.c:747
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:651
-msgid "Saving changes to message..."
-msgstr ""
-
-#: composer/e-msg-composer.c:653
-msgid "Save changes to message..."
-msgstr ""
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
+#: composer/e-msg-composer.c:819
+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:752 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:877 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:206
 msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:758
+#: composer/e-msg-composer.c:883
 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:908
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:1034
 msgid "That file does not exist."
 msgstr ""
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:1044
 msgid "That is not a regular file."
 msgstr ""
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:1054
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:939
+#: composer/e-msg-composer.c:1064
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:961
+#: 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:982
+#: composer/e-msg-composer.c:1107
 msgid "An error occurred while reading the file."
 msgstr ""
 
-#: composer/e-msg-composer.c:1362
+#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1439
+#: composer/e-msg-composer.c:1829
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:346
+#: 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 "Cannot initialise Evolution's mail component."
 
-#: filter/filter-datespec.c:62
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr ""
+
+#: data/evolution.keys.in.h:1
+msgid "address card"
+msgstr ""
+
+#: data/evolution.keys.in.h:2
+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:1282 widgets/misc/e-dateedit.c:1463
+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"
+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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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:2503
+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
+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
+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
 msgid "year"
 msgstr ""
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "years"
 msgstr ""
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "month"
 msgstr ""
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "months"
 msgstr ""
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "week"
 msgstr ""
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "weeks"
 msgstr ""
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:81
 msgid "days"
 msgstr ""
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hour"
 msgstr ""
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hours"
 msgstr ""
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:83
 msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr ""
-
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "second"
 msgstr ""
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "seconds"
 msgstr ""
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:199
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:201
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:275
 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:298
 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:338
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -2959,144 +4974,140 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:374
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:432
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
 msgid "now"
 msgstr ""
 
-#: filter/filter-datespec.c:690
+#: filter/filter-datespec.c:706
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-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"
-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:453
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:414
+#: filter/filter-filter.c:467
 msgid "Add action"
 msgstr ""
 
-#: filter/filter-filter.c:420
-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."
 msgstr ""
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
+#: mail/mail-account-gui.c:682
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:247
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:293
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:185
+#: filter/filter-input.c:194
 #, 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:475
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:534
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:646
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:664
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:668
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:673
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:587
+#: filter/filter-rule.c:684
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
 msgstr ""
 
-#: filter/filter-system-flag.c:63
-msgid "Replied to"
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
 msgstr ""
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
+#: filter/filter.glade.h:7
+msgid "Incoming"
 msgstr ""
 
-#: filter/filter-system-flag.c:67
-msgid "Read"
+#: 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 ""
 
 #. Automatically generated. Do not edit.
@@ -3109,359 +5120,451 @@ msgid "Assign Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
+msgid "Attachments"
 msgstr ""
 
 #: filter/libfilter-i18n.h:5
-msgid "Date received"
+msgid "Copy to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:6
-msgid "Date sent"
+msgid "Date received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
+#: filter/libfilter-i18n.h:7
+msgid "Date sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
+msgid "Deleted"
 msgstr ""
 
 #: filter/libfilter-i18n.h:10
-msgid "Message Body"
+msgid "Do Not Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:11
-msgid "Message Header"
+msgid "Draft"
 msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
+msgid "Forward to Address"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "Recipients"
+msgid "Important"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "Regex Match"
+msgid "Is Not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
-msgid "Score"
+#: filter/libfilter-i18n.h:17
+msgid "Is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Set Status"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
+msgid "Message was received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-msgid "Status"
+#: filter/libfilter-i18n.h:22
+msgid "Message was sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
+msgid "Move to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
+#: filter/libfilter-i18n.h:24
+msgid "Read"
 msgstr ""
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
+msgid "Replied to"
+msgstr ""
+
+#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
+#: mail/message-list.c:1052
+msgid "Score"
+msgstr ""
+
+#: filter/libfilter-i18n.h:29
+msgid "Sender"
+msgstr ""
+
+#: filter/libfilter-i18n.h:30
+msgid "Set Status"
+msgstr ""
+
+#: filter/libfilter-i18n.h:31
+msgid "Source Account"
+msgstr ""
+
+#: filter/libfilter-i18n.h:32
+msgid "Specific header"
+msgstr ""
+
+#: filter/libfilter-i18n.h:34
+msgid "Stop Processing"
+msgstr ""
+
+#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
+msgid "Subject"
+msgstr ""
+
+#: filter/libfilter-i18n.h:38
 msgid "contains"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:39
 msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:40
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:41
 msgid "does not exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:42
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:43
 msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:44
 msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:45
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:46
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:47
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:48
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:49
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:50
 msgid "on or after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:51
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:52
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:54
 msgid "was after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:55
 msgid "was before"
 msgstr ""
 
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr ""
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
+#: filter/score-editor.c:130
+msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr ""
-
-#: mail/component-factory.c:284
+#: mail/component-factory.c:329
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:320
+#: mail/component-factory.c:402
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr ""
-
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr ""
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr ""
-
-#: mail/folder-browser.c:240
-msgid "Subject contains"
+#: mail/folder-browser-factory.c:209
+#, c-format
+msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
+#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
+#: mail/folder-browser.c:225
+msgid "Store search as vFolder"
 msgstr ""
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:533
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:646
+#: mail/folder-browser.c:536
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:539
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:542 mail/folder-browser.c:733
+msgid "VFolder on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:548
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:650
+#: mail/folder-browser.c:551
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:651
+#: mail/folder-browser.c:554
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
+#: mail/folder-browser.c:557 mail/folder-browser.c:732
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:658
-msgid "Open"
+#: mail/folder-browser.c:568
+msgid "Resend"
 msgstr ""
 
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr ""
-
-#: mail/folder-browser.c:660
+#: mail/folder-browser.c:570
 msgid "Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-msgid "Print"
-msgstr ""
-
-#: mail/folder-browser.c:663
+#: mail/folder-browser.c:577
 msgid "Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:664 mail/mail-view.c:141
+#: 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:665 mail/mail-view.c:144
+#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
 msgid "Forward"
 msgstr ""
 
-#: mail/folder-browser.c:666
+#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
 msgid "Forward inline"
 msgstr ""
 
-#: mail/folder-browser.c:668
+#: mail/folder-browser.c:586
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:669
+#: mail/folder-browser.c:588
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:593
 msgid "Move to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:595
 msgid "Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
 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:678
+#. { _("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"
 msgstr ""
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:613
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:735
 #, 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"
+#: mail/folder-browser.c:736
+#, 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/mail-accounts.c:115
+#: 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/local-config.glade.h:1
+msgid "Current store format:"
+msgstr ""
+
+#: mail/local-config.glade.h:2
+msgid "Mailbox Format"
+msgstr ""
+
+#: mail/local-config.glade.h:3
+msgid "New store format:"
+msgstr ""
+
+#: 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"
+"recoverable.  Please use this feature with care."
+msgstr ""
+
+#: mail/local-config.glade.h:7
+msgid "maildir"
+msgstr ""
+
+#: mail/local-config.glade.h:8
+msgid "mbox"
+msgstr ""
+
+#: mail/local-config.glade.h:9
+msgid "mh"
+msgstr ""
+
+#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
 msgid " (default)"
 msgstr ""
 
+#: mail/mail-accounts.c:197
+msgid "Disable"
+msgstr ""
+
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+msgid "Enable"
+msgstr ""
+
+#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+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 ""
+
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
+#: mail/mail-accounts.c:536
 msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/mail-account-editor.c:274
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
+#: 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:634
+#: mail/mail-account-editor.c:173
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-autofilter.c:71
+#: 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: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:357
+msgid "Add Filter Rule"
+msgstr ""
+
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3469,756 +5572,1017 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:136
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:223
+#: mail/mail-callbacks.c:202
 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:235
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:345
+#: mail/mail-callbacks.c:308
+msgid "You must specify recipients in order to send this message."
+msgstr ""
+
+#: mail/mail-callbacks.c:351
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:365
-msgid "You must specify recipients in order to send this message."
+#: mail/mail-callbacks.c:591
+#, c-format
+msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:594
+#: mail/mail-callbacks.c:773
 msgid "Forwarded message:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:675
+#: mail/mail-callbacks.c:876
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:677
+#: mail/mail-callbacks.c:878
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:812
+#: mail/mail-callbacks.c:1019
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
+#: mail/mail-callbacks.c:1056
+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?"
 msgstr ""
 
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
+#: 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:893
+#: mail/mail-callbacks.c:1137
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:895
+#: mail/mail-callbacks.c:1139
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:979
+#: mail/mail-callbacks.c:1253
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1028
+#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:1075
+#: mail/mail-callbacks.c:1349
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-config-druid.c:363
-#, c-format
+#: mail/mail-config.c:1043 mail/mail-config.c:1046
+msgid "Connecting to server..."
+msgstr ""
+
+#: mail/mail-config.glade.h:1
+msgid " Check for supported types "
+msgstr ""
+
+#: mail/mail-config.glade.h:2
+#, fuzzy
+msgid " color"
+msgstr "Colours"
+
+#: mail/mail-config.glade.h:3
+msgid "Account"
+msgstr ""
+
+#: mail/mail-config.glade.h:4
+msgid "Account Information"
+msgstr ""
+
+#: mail/mail-config.glade.h:5
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config.glade.h:6
+msgid "Accounts"
+msgstr ""
+
+#: mail/mail-config.glade.h:8
+msgid "Authentication"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
+msgid "Authentication Type: "
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Automatically check for new mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:12
 msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+"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-config-druid.c:629
-#, c-format
+#: mail/mail-config.glade.h:18
+msgid "De_fault"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+msgid "Done"
+msgstr ""
+
+#: mail/mail-config.glade.h:21
+msgid "Drafts"
+msgstr ""
+
+#: mail/mail-config.glade.h:22
+msgid "Drafts folder:"
+msgstr ""
+
+#: mail/mail-config.glade.h:24
+msgid "Email Address:"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+msgid "Full Name:"
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Highlight citations with "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "IMAPv4 "
+msgstr ""
+
+#: mail/mail-config.glade.h:30
+msgid "Identity"
+msgstr ""
+
+#: mail/mail-config.glade.h:31
+msgid "Kerberos "
+msgstr ""
+
+#: mail/mail-config.glade.h:32
+msgid "Mail Configuration"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+msgid "Make this my default account"
+msgstr ""
+
+#: mail/mail-config.glade.h:34
+msgid "Mark messages as \"Read\" after:"
+msgstr ""
+
+#: mail/mail-config.glade.h:36
+msgid "News"
+msgstr ""
+
+#: mail/mail-config.glade.h:38
+msgid "Optional Information"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Organization:"
+msgstr "Organisation:"
+
+#: mail/mail-config.glade.h:41
+msgid "PGP binary path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:46
+msgid "Qmail maildir "
+msgstr ""
+
+#: mail/mail-config.glade.h:47
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Receiving Mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:49
+msgid "Receiving Options"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
+msgid "Required Information"
+msgstr ""
+
+#: mail/mail-config.glade.h:53
+msgid "Select PGP binary"
+msgstr ""
+
+#: mail/mail-config.glade.h:54
+msgid "Send mail in HTML format by default."
+msgstr ""
+
+#: mail/mail-config.glade.h:55
+msgid "Sending Email"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Sending Mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:58
+msgid "Sent"
+msgstr ""
+
+#: mail/mail-config.glade.h:59
+msgid "Sent and Draft Messages"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
+msgid "Sent messages folder:"
+msgstr ""
+
+#: mail/mail-config.glade.h:61
+msgid "Server Configuration"
+msgstr ""
+
+#: mail/mail-config.glade.h:62
+msgid "Server Type: "
+msgstr ""
+
+#: mail/mail-config.glade.h:63
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config.glade.h:64
+msgid "Signature file:"
+msgstr ""
+
+#: mail/mail-config.glade.h:65
+msgid "Sources"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
+msgid "Special Folders"
+msgstr ""
+
+#: mail/mail-config.glade.h:67
+msgid "Standard Unix mbox"
+msgstr ""
+
+#: mail/mail-config.glade.h:68
+msgid "Type"
+msgstr ""
+
+#: mail/mail-config.glade.h:69
+msgid "Use secure connection (SSL)"
+msgstr ""
+
+#: mail/mail-config.glade.h:70
+msgid "Username:"
+msgstr ""
+
+#: mail/mail-config.glade.h:71
 msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+"Welcome to the Evolution Mail Configuration Druid.\n"
+"\n"
+"Click \"Next\" to begin. "
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:949
-msgid "Evolution Account Wizard"
+#: 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 ""
 
-#: mail/mail-display.c:98
-#, c-format
+#: mail/mail-config-druid.c:99
 msgid ""
-"Could not open file %s:\n"
-"%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-display.c:131
-#, c-format
-msgid "Could not write data: %s"
+#: 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-display.c:229
+#: 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:445
+msgid "Evolution Account Wizard"
+msgstr ""
+
+#: mail/mail-display.c:194
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:269
+#: mail/mail-display.c:234
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/mail-display.c:311
+#: mail/mail-display.c:295
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:313
+#: mail/mail-display.c:297
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:315
+#: mail/mail-display.c:299
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:334
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:365
+#: mail/mail-display.c:357
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:369
+#: mail/mail-display.c:361
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-format.c:504
+#: mail/mail-display.c:1102
+msgid "Open link in browser"
+msgstr ""
+
+#: mail/mail-display.c:1104
+msgid "Save as (FIXME)"
+msgstr ""
+
+#: mail/mail-display.c:1106
+msgid "Copy location (FIXME)"
+msgstr ""
+
+#: mail/mail-format.c:518
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:626
-msgid "Reply-To:"
+#: mail/mail-format.c:560
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:856
+#: mail/mail-format.c:742
+msgid "Loading message content"
+msgstr ""
+
+#: mail/mail-format.c:1046
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:1052
 msgid "Encrypted message"
 msgstr ""
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:1053
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1438
+#: mail/mail-format.c:1137 mail/mail-format.c:1526
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1145 mail/mail-format.c:1534
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1747
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1759
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1454
+#: mail/mail-format.c:1763
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1488
+#: mail/mail-format.c:1797
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1493
+#: mail/mail-format.c:1802
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1663
+#: mail/mail-local.c:337
 #, c-format
-msgid "On %s, %s wrote:\n"
+msgid "No such folder %s"
 msgstr ""
 
-#: mail/mail-local.c:204
+#: mail/mail-local.c:509
+#, c-format
+msgid "Opening '%s'"
+msgstr ""
+
+#: mail/mail-local.c:787
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:208
+#: mail/mail-local.c:791
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:251
+#: mail/mail-local.c:815
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:269
+#. first, 'close' the old folder
+#: mail/mail-local.c:844
 msgid "Closing current folder"
 msgstr ""
 
-#: mail/mail-local.c:295
+#: mail/mail-local.c:876
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:313
+#: mail/mail-local.c:894
 msgid "Creating new folder"
 msgstr ""
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:908
 msgid "Copying messages"
 msgstr ""
 
-#: mail/mail-local.c:348
+#: mail/mail-local.c:925
 #, 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:379
+#: mail/mail-local.c:964
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr ""
-
-#: mail/mail-local.c:789
-msgid "Register local folder"
-msgstr ""
-
-#: mail/mail-local.c:893
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:85
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:87
+#: mail/mail-mt.c:192
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:107
-#, c-format
-msgid "Fetching email from %s"
+#: mail/mail-mt.c:679 mail/session.c:98
+msgid "Do you accept?"
 msgstr ""
 
-#: mail/mail-ops.c:109
-#, c-format
-msgid "Fetch email from %s"
+#: mail/mail-mt.c:873
+msgid "Evolution progress"
 msgstr ""
 
-#: mail/mail-ops.c:359
-#, c-format
-msgid "There is no new mail at %s."
-msgstr ""
-
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:563
+#: mail/mail-ops.c:587
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:565
+#: mail/mail-ops.c:589
 msgid "Sending message"
 msgstr ""
 
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr ""
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
+#: mail/mail-ops.c:704
+#, c-format
+msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
+#: mail/mail-ops.c:723
 #, c-format
-msgid "Appending \"%s\""
+msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
+#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:912
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:914
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
+#: mail/mail-ops.c:811
+msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:884
 #, c-format
-msgid "Move messages from \"%s\" into \"%s\""
+msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:884
 #, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
+msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:950
+#: mail/mail-ops.c:900
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:953
+#: mail/mail-ops.c:903
 msgid "Copying"
 msgstr ""
 
-#: 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:978
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-msgid "(No description)"
-msgstr ""
-
-#: mail/mail-ops.c:1179
+#: mail/mail-ops.c:1139
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
+#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1351
-#, fuzzy
-msgid "Synchronising folder"
-msgstr "Synchronising \"%s\""
+#: mail/mail-ops.c:1247
+#, c-format
+msgid "Opening store %s"
+msgstr ""
 
-#: mail/mail-ops.c:1401
+#: mail/mail-ops.c:1434
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1450
+#: mail/mail-ops.c:1483
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1517
+#: mail/mail-ops.c:1550
 msgid "Retrieving messages"
 msgstr ""
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1560
 #, 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
+#: mail/mail-ops.c:1634
 msgid "Saving messages"
 msgstr ""
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1713
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1935
+#: mail/mail-ops.c:1726
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:1740
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
+#: mail/mail-ops.c:1814
+msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-threads.c:302
+#: mail/mail-ops.c:1829
 #, c-format
 msgid ""
-"Error while preparing to %s:\n"
-"%s"
+"Cannot create output file: %s:\n"
+" %s"
 msgstr ""
 
-#: mail/mail-threads.c:676
+#: mail/mail-ops.c:1857
 #, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
+msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
 msgstr ""
 
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
+#: mail/mail-send-recv.c:138
+msgid "Cancelling ..."
 msgstr ""
 
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
+#: mail/mail-send-recv.c:233
+msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
+#: mail/mail-send-recv.c:236
+msgid "Receiving"
 msgstr ""
 
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
+#: mail/mail-send-recv.c:285
+msgid "Updating ..."
 msgstr ""
 
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
+#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
+msgid "Waiting ..."
 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:306
+msgid "Sending"
 msgstr ""
 
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
+#: mail/mail-send-recv.c:471
+msgid "Cancelled."
 msgstr ""
 
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
+#: mail/mail-summary.c:109
+msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-tools.c:347
+#: mail/mail-tools.c:141
 #, c-format
-msgid "Saving changes to %s"
+msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:381
+#: mail/mail-tools.c:188
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr ""
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:198
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:427
+#: mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:217
 msgid "Forwarded message (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:530
+#: mail/mail-tools.c:414
 #, c-format
 msgid ""
-"Cannot open location `%s':\n"
-"%s"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
 msgstr ""
 
-#: mail/mail-vfolder.c:149
+#: mail/mail-vfolder.c:249
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:298
+#: mail/mail-vfolder.c:427
 msgid "New VFolder"
 msgstr ""
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
 msgid "Reply"
 msgstr ""
 
-#: mail/mail-view.c:138
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
 msgid "Reply to the sender of this message"
 msgstr ""
 
-#: mail/mail-view.c:141
+#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
 msgid "Reply to all recipients of this message"
 msgstr ""
 
-#: mail/mail-view.c:144
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
 msgid "Forward this message"
 msgstr ""
 
-#: mail/mail-view.c:148
+#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
 msgid "Print the selected message"
 msgstr ""
 
-#: mail/mail-view.c:150
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr ""
 
-#: mail/message-list.c:599
+#: mail/message-list.c:648
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:602
+#: mail/message-list.c:649
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:605
+#: mail/message-list.c:650
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:890
-#, c-format
-msgid "[ %s ]"
+#: mail/message-list.c:651
+msgid "Multiple Unseen Messages"
 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
-#, c-format
-msgid "%s, et al."
+#: mail/message-list.c:652
+msgid "Multiple Messages"
+msgstr ""
+
+#: mail/message-list.c:656
+msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:905 mail/message-list.c:921
-msgid "<unknown>"
+#: mail/message-list.c:657
+msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:973
+#: mail/message-list.c:661
+msgid "Higher"
+msgstr ""
+
+#: mail/message-list.c:662
+msgid "Highest"
+msgstr ""
+
+#: mail/message-list.c:912
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:980
+#: mail/message-list.c:919
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:989
+#: mail/message-list.c:928
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:940
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1009
+#: mail/message-list.c:948
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1011
+#: mail/message-list.c:950
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:1109
+#: mail/message-list.c:1052
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1109
-msgid "Attachment"
-msgstr ""
-
-#: mail/message-list.c:1110
+#: mail/message-list.c:1053
 msgid "From"
 msgstr ""
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1053
 msgid "Date"
 msgstr ""
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1053
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1054
 msgid "To"
 msgstr ""
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1054
 msgid "Size"
 msgstr ""
 
-#: mail/openpgp-utils.c:78
-#, c-format
-msgid "Please enter your %s passphrase for %s"
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+msgid "Folder"
 msgstr ""
 
-#: mail/openpgp-utils.c:81
-#, c-format
-msgid "Please enter your %s passphrase"
+#: mail/subscribe-dialog.c:77
+msgid "Store"
 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."
+#: mail/subscribe-dialog.c:138
+msgid "Display folders starting with:"
 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."
+#: mail/subscribe-dialog.c:168
+#, c-format
+msgid "Getting store for \"%s\""
 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
+#: mail/subscribe-dialog.c:271
 #, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
-msgid "No recipients specified"
+#: mail/subscribe-dialog.c:273
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/openpgp-utils.c:1065
-#, c-format
-msgid "Couldn't create temp file: %s"
+#. Construct the app
+#: mail/subscribe-dialog.c:873
+msgid "Manage Subscriptions"
 msgstr ""
 
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-msgid "Folder"
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:63
-msgid "Store"
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:178
+#: 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 "Getting store for \"%s\""
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
 msgstr ""
 
-#: mail/subscribe-dialog.c:181
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
 #, c-format
-msgid "Get store for \"%s\""
+msgid ""
+"Importing %s\n"
+"Importing item %d."
 msgstr ""
 
-#: mail/subscribe-dialog.c:289
+#: shell/importer/importer.c:341
 #, c-format
-msgid "Subscribing to folder \"%s\""
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+
+#: shell/importer/importer.c:351
+msgid "Importing"
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
+#: shell/importer/importer.c:359
 #, c-format
-msgid "Unsubscribing from folder \"%s\""
+msgid ""
+"Importing %s.\n"
+"Starting %s"
 msgstr ""
 
-#: mail/subscribe-dialog.c:297
+#: shell/importer/importer.c:372
 #, c-format
-msgid "Subscribe to folder \"%s\""
+msgid "Error starting %s"
 msgstr ""
 
-#: mail/subscribe-dialog.c:300
+#: shell/importer/importer.c:387
 #, c-format
-msgid "Unsubscribe from folder \"%s\""
+msgid "Error loading %s"
+msgstr ""
+
+#: shell/importer/importer.c:402
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: 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/e-setup.c:112 shell/e-setup.c:185
+#: 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/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:122
 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:123
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:157
+#: shell/e-setup.c:163
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
+#: shell/e-setup.c:166 shell/e-setup.c:234
 msgid "Evolution files successfully installed."
 msgstr ""
 
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
+#: shell/e-setup.c:195
+msgid "This seems to be the first time you are running Evolution."
 msgstr ""
 
-#: shell/e-setup.c:190
+#: shell/e-setup.c:196
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:215
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -4226,14 +6590,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:224
+#: shell/e-setup.c:230
 #, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:255
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -4241,7 +6605,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:267
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -4249,18 +6613,18 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:82
+#: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:134
+#: shell/e-shell-folder-creation-dialog.c:156
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:225
+#: shell/e-shell-folder-creation-dialog.c:248
 msgid "Evolution - Create new folder"
 msgstr ""
 
@@ -4270,573 +6634,1636 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:297
+#: shell/e-shell-folder-selection-dialog.c:319
 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:459 shell/e-shell-folder-title-bar.c:460
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:179
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:208
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:210
 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:374
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view.c:140
+#: shell/e-shell-view.c:148
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:468
-msgid "Folders"
-msgstr ""
-
-#: shell/e-shell-view.c:1098
+#: shell/e-shell-view.c:1134
 #, c-format
 msgid "%s - Evolution %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1100
+#: shell/e-shell-view.c:1136
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr ""
 
-#: shell/e-shell.c:372
+#: shell/e-shell.c:378
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1212
+#: shell/e-shell.c:1248
 #, 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:134
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:137
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:260
 #, 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:265
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:276
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:277
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:279
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:280
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:291
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:292
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:294
 msgid "_Remove This Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:295
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:300
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:301
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:388
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:358
+#: shell/e-shortcuts.c:379
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage-set-view.c:338
+#: 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 ""
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-storage-set-view.c:649
 msgid "View the selected folder"
 msgstr ""
 
-#: shell/e-storage.c:138
+#: shell/e-storage.c:178
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:389
+#: shell/e-storage.c:459
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:391
+#: shell/e-storage.c:461
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:393
+#: shell/e-storage.c:463
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:395
+#: shell/e-storage.c:465
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:397
+#: shell/e-storage.c:467
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:399
+#: shell/e-storage.c:469
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:401
+#: shell/e-storage.c:471
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:403
+#: shell/e-storage.c:473
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:405
+#: shell/e-storage.c:475
 msgid "Permission denied"
 msgstr ""
 
-#: shell/e-storage.c:407
+#: shell/e-storage.c:477
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:409
+#: shell/e-storage.c:479
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/main.c:74
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "Cannot initialise the Evolution shell."
+
+#: shell/main.c:83
+#, 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"
-"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. 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"
 "\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"
+"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"
 "\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:108
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:132
+#: shell/main.c:139
 msgid "Cannot initialize the Evolution shell."
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:178
-msgid "Disable."
+#: shell/main.c:185
+msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:198
+#: shell/main.c:186
+msgid "Send the debugging output of all components to a file."
+msgstr ""
+
+#: shell/main.c:219
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Cannot initialise the Bonobo component system."
 
-#: ui/evolution-contact-editor.xml:7
-msgid "FIXME: _Appointment"
+#: ui/evolution-addressbook.xml.h:2
+msgid "Create new contact"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:8
-msgid "FIXME: Meeting Re_quest"
+#: ui/evolution-addressbook.xml.h:4
+msgid "Delete a contact"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:10
-msgid "FIXME: _Mail Message"
+#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
+msgid "Find"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
+#: ui/evolution-addressbook.xml.h:6
+msgid "Find a contact"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
+#: ui/evolution-addressbook.xml.h:7
+msgid "New contact"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
+msgid "Previews the message to be printed"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
+#: ui/evolution-addressbook.xml.h:11
+msgid "Print contacts"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
+msgid "Stop"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
+#: ui/evolution-addressbook.xml.h:13
+msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
+#: ui/evolution-addressbook.xml.h:14
+msgid "View All"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:24
-msgid "FIXME: Define Print _Styles..."
+#: ui/evolution-addressbook.xml.h:15
+msgid "View all contacts"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
+#: ui/evolution-addressbook.xml.h:16
+msgid "_Addressbook Sources..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:35
-msgid "FIXME: Save Attac_hments..."
+#: ui/evolution-addressbook.xml.h:17
+msgid "_Contact"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
+#: ui/evolution-contact-editor.xml.h:15
+msgid "_Print..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
+#: ui/evolution-addressbook.xml.h:19
+msgid "_Search for contacts"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:41
-msgid "Page Set_up"
+#: 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"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
+#: ui/evolution-calendar.xml.h:1
+msgid "5 Days"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:63
-msgid "FIXME: Paste _Special..."
+#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
+msgid "Alter preferences"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:68
-msgid "FIXME: Mark as U_nread"
+#: ui/evolution-calendar.xml.h:4
+msgid "Create a new all day Event"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
+#: ui/evolution-calendar.xml.h:5
+msgid "Create a new appointment"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
+#: ui/evolution-calendar.xml.h:6
+msgid "Create a new calendar"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
+#: ui/evolution-calendar.xml.h:7
+msgid "Day"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
+#: ui/evolution-calendar.xml.h:8
+msgid "Go To"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
+#: ui/evolution-calendar.xml.h:9
+msgid "Go back in time"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
+#: ui/evolution-calendar.xml.h:10
+msgid "Go forward in time"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:93
-msgid "FIXME: __Formatting"
+#: ui/evolution-calendar.xml.h:11
+msgid "Go to _Date"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
+#: ui/evolution-calendar.xml.h:12
+msgid "Go to _Today"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:102
-msgid "Ne_xt"
+#: ui/evolution-calendar.xml.h:14
+msgid "Go to present time"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:104
-msgid "_Toolbars"
+#: ui/evolution-calendar.xml.h:15
+msgid "Month"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
+#: ui/evolution-calendar.xml.h:17
+msgid "New _Event"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
+#: 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-contact-editor.xml:111
-msgid "FIXME: _Object..."
+#: ui/evolution-calendar.xml.h:20
+msgid "Open Calendar"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
+#: ui/evolution-calendar.xml.h:21
+msgid "Prev"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
+#: ui/evolution-calendar.xml.h:22
+msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
+#: ui/evolution-calendar.xml.h:25
+msgid "Print calendar"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
+#: ui/evolution-calendar.xml.h:26
+msgid "Print this Calendar"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
+#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
+msgid "Save As"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
+#: ui/evolution-calendar.xml.h:28
+msgid "Save calendar as something else"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
+#: ui/evolution-calendar.xml.h:30
+msgid "Show 1 day"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
+#: ui/evolution-calendar.xml.h:31
+msgid "Show 1 month"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:137
-msgid "_Forms"
+#: ui/evolution-calendar.xml.h:32
+msgid "Show 1 week"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:142
-msgid "FIXME: _New Contact"
+#: ui/evolution-calendar.xml.h:33
+msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
+#: widgets/misc/e-dateedit.c:422
+msgid "Today"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:145
-msgid "FIXME: New _Letter to Contact"
+#: ui/evolution-calendar.xml.h:35
+msgid "W_ork Week"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:146
-msgid "FIXME: New _Message to Contact"
+#: ui/evolution-calendar.xml.h:36
+msgid "Week"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:147
-msgid "FIXME: New Meetin_g with Contact"
+#: ui/evolution-calendar.xml.h:37
+msgid "_Appointment"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:148
-msgid "FIXME: _Plan a Meeting..."
+#: ui/evolution-calendar.xml.h:38
+msgid "_Day"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:149
-msgid "FIXME: New _Task for Contact"
+#: ui/evolution-calendar.xml.h:39
+msgid "_Month"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:150
-msgid "FIXME: New _Journal Entry for Contact"
+#: 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-contact-editor.xml:152
-msgid "FIXME: _Flag for Follow Up..."
+#: ui/evolution-calendar.xml.h:41
+msgid "_Open Calendar"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:153
-msgid "FIXME: _Display Map of Address"
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
+#: ui/evolution-tasks.xml.h:8
+msgid "_Save As..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:154
-msgid "FIXME: _Open Web Page"
+#: ui/evolution-calendar.xml.h:45
+msgid "_Week"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:156
-msgid "FIXME: Forward as _vCard"
+#: ui/evolution-contact-editor.xml.h:2
+msgid "Delete this item"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
+#: ui/evolution-contact-editor.xml.h:3
+msgid "Delete..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
+#: ui/evolution-contact-editor.xml.h:4
+msgid "Help"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
+#: ui/evolution-contact-editor.xml.h:5
+msgid "Print En_velope..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
+#: 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
+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 ""
+
+#: ui/evolution-contact-editor.xml.h:11
+msgid "Se_nd contact to other..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml.h:12
+msgid "See online help"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml.h:13
+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 ""
 
-#: ui/evolution-contact-editor.xml:172
+#: 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"
+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-editor.xml:246
-msgid "FIXME: Previous"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
+msgid "Address _Book... (FIXME)"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
+#: 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:6 ui/evolution-task-editor-dialog.xml.h:7
+msgid "C_ut"
+msgstr ""
+
+#: 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: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:11
+msgid "Close this appointment"
+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:13 ui/evolution-mail.xml.h:7
+#: ui/evolution-task-editor-dialog.xml.h:14
+msgid "Copy"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:249
-msgid "FIXME: Next"
+#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
+msgid "Copy the selection"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:250
+#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
+msgid "Cut"
+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:18
+msgid "Delete this appointment"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
+msgid "Dump XML"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
+msgid "Dump the UI Xml description"
+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-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
+msgid "For_ward (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:23
+msgid "Forward as v_Calendar (FIXME)"
+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-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
+msgid "Go to the previous item"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
+msgid "In_complete Task (FIXME)"
+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-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
+msgid "N_ext"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
+msgid "Paste"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
+msgid "Pre_vious"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
+msgid "Previous"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
+msgid "Print Pre_view"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
+msgid "Print S_etup..."
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
+msgid "Print Setup"
+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-event-editor.xml.h:43
+msgid "Save the appointment and close the dialog box"
+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-event-editor.xml.h:46
+msgid "Schedule _Meeting"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:47
+msgid "Schedule some sort of a meeting"
+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"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+msgid "Select everything"
+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-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+msgid "Task _Request (FIXME)"
+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-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-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
+#: ui/evolution.xml.h:28
+msgid "_Contact (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
+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 ""
+
+#: 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 ""
+
+#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
+msgid "_Item (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
+msgid "_Journal Entry (FIXME)"
+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-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
+msgid "_Mail Message (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
+msgid "_Move to Folder... (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
+msgid "_Note (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
+msgid "_Paste"
+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 ""
+
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
+#: ui/evolution-task-editor-dialog.xml.h:83
+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:41
+msgid "_Task (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+msgid "_Unread Item (FIXME)"
+msgstr ""
+
+#: ui/evolution-executive-summary.xml.h:1
+msgid "Add Service"
+msgstr ""
+
+#: ui/evolution-executive-summary.xml.h:2
+msgid "Add a new service to the Executive Summary"
+msgstr ""
+
+#: ui/evolution-executive-summary.xml.h:3
+msgid "Create a new email"
+msgstr ""
+
+#: ui/evolution-executive-summary.xml.h:4
+msgid "Executive Summary Settings..."
+msgstr ""
+
+#: ui/evolution-executive-summary.xml.h:5
+msgid "New Mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:2
+msgid "Apply any new filters to the mail in this box"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:3
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:4
+#, fuzzy
+msgid "Compose"
+msgstr "Colours"
+
+#: ui/evolution-mail.xml.h:5
+msgid "Compose a new message"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:6
+msgid "Configure Folder..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:8
+msgid "Copy message to a new folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:9
+msgid "Copy selected messages to another folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:10
+msgid "Create _Virtual Folder From Message"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:12
+msgid "Delete the selected messages"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:14
+msgid "Display all of the message headers"
+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.xml.h:17
+msgid "Empty _Trash"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:18
+msgid "Expunge"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:19
+msgid "Filter on Se_nder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:20
+msgid "Filter on _Recipients"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:21
+msgid "Filter on _Subject"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:22
+msgid "Finaly remove all mails tagged for deletion"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:23
+msgid "Forget _Passwords"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:25
+msgid "Forward As"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:27
+msgid "Forward the selected mail to someone"
+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.xml.h:30
+msgid "Full _Headers"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:31
+msgid "Hide Deleted Messages"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:32
+msgid "Hide S_elected Messages"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:33
+msgid "Hide _Deleted Messages"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:34
+msgid "Hide _Read messages"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:35
+msgid "Invert Selection"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:36
+msgid "Manage _Subscriptions..."
+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.xml.h:40
+msgid "Mark As U_nread"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:41
+msgid "Mark as U_nread"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:42
+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"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:44
+msgid "Move"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:45
+msgid "Move message to a new folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:46
+msgid "Move selected messages to another folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:47
+msgid "Open in New Window"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:48
+msgid "Open the current message in a new window"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:53
+msgid "Print Preview of message..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:54
+msgid "Print message to the printer"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:55
+msgid "Print message..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:58
+msgid "Redirect (FIXME: implement me)"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:61
+msgid "Reply to _All"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:62
+msgid "Reply to all"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:64
+msgid "Reply to sender"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:66
+msgid "S_ource"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:67
+msgid "Save the message into a new file"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
+msgid "Select _All"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:70
+msgid "Select _Thread"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:71
+msgid "Send / Receive"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:72
+msgid "Send a reply to the person who sent you this mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:73
+msgid "Send a single mail in reply to all the selected mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:74
+msgid ""
+"Send queued mail\n"
+"    and retrieve new mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:76
+msgid "Send queued mail and retrieve new mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:77
+msgid "Show _All"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:79
+msgid "Threaded Message list"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:80
+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
+msgid "VFolder on _Recipients"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:84
+msgid "VFolder on _Subject"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:85
+msgid "View Raw Message Source"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:86
+msgid "Virtual Folder _Editor..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:87
+msgid "_Apply Filters"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:88
+msgid "_Attachment"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:89
+msgid "_Copy to Folder..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:90
+msgid "_Create Filter From Message"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:92
+msgid "_Expunge"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:93
+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
+msgid "_Mail Message"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:99
+msgid "_Mail Settings..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:100
+msgid "_Move to Folder..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:101
+msgid "_Open Selected Items"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:103
+msgid "_Quoted"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:104
+msgid "_Reply"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:105
+msgid "_Resend Messages"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:107
+msgid "_Save Message As..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:108
+msgid "_Send / Receive"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:109
+msgid "_Threaded"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:111
+msgid "_Undelete"
+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
+msgid "Close the current file"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:5
+msgid "Encrypt this message with PGP"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:6
+msgid "F_ormat"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:7
+msgid "HTML"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
+msgid "Insert a file as text into the message"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:9
+msgid "Insert text file..."
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:11
+msgid "Open a file"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:12
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:13
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:17
+msgid "Save _Draft"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save in _folder... (FIXME)"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:19
+msgid "Save in folder..."
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:21
+msgid "Save the current file with a different name"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save the message in a specified folder"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:23
+msgid "Send"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send _Later"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:25
+msgid "Send _later"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:26
+msgid "Send the mail in HTML format"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:27
+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
+msgid "Send this message now"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:30
+msgid "Show / hide attachments"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:31
+msgid "Show _attachments"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:32
+msgid "Show attachments"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:33
+msgid "Sign this message with your PGP key"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:34
+msgid "Toggles whether the BCC field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:35
+msgid "Toggles whether the CC field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:36
+msgid "Toggles whether the From chooser is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:39
+msgid "_Bcc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:40
+msgid "_Cc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:47
+msgid "_Insert"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Insert text file... (FIXME)"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:49
+msgid "_Open..."
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:50
+msgid "_Reply-To Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:52
+msgid "_Security"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:1
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:3
+msgid "F_older"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:4
+msgid "Refresh List"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:5
+msgid "Refresh List of Folders"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:6
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:8
+msgid "Subscribe"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:9
+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 ""
+
+#: 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 ""
+
+#: 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:26
+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 ""
+
+#: ui/evolution-tasks.xml.h:2
+msgid "Create a new task"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:3
+msgid "New Task"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:5
+msgid "Save task as something else"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:6
+msgid "Tasks Preferences..."
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:9
+msgid "_Task"
+msgstr ""
+
+#: ui/evolution.xml.h:1
+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:5
+msgid "Customize"
+msgstr ""
+
+#: ui/evolution.xml.h:6
+msgid "Customize toolbars"
+msgstr ""
+
+#: ui/evolution.xml.h:7
+msgid "Display a different folder"
+msgstr ""
+
+#: ui/evolution.xml.h:8
+msgid "E_xit"
+msgstr ""
+
+#: ui/evolution.xml.h:9
+msgid "Evolution bar _shortcut"
+msgstr ""
+
+#: ui/evolution.xml.h:10
+msgid "Exit the program"
+msgstr ""
+
+#: ui/evolution.xml.h:11
+msgid "Getting _Started"
+msgstr ""
+
+#: ui/evolution.xml.h:12
+msgid "Import an external file format"
+msgstr ""
+
+#: ui/evolution.xml.h:13
+msgid "Main toolbar"
+msgstr ""
+
+#: ui/evolution.xml.h:14
+msgid "Show information about Evolution"
+msgstr ""
+
+#: ui/evolution.xml.h:15
+msgid "Submit Bug Report"
+msgstr ""
+
+#: ui/evolution.xml.h:16
+msgid "Submit _Bug Report"
+msgstr ""
+
+#: ui/evolution.xml.h:17
+msgid "Submit bug report using Bug Buddy."
+msgstr ""
+
+#: ui/evolution.xml.h:18
+msgid "Toggle whether to show the folder bar"
+msgstr ""
+
+#: ui/evolution.xml.h:19
+msgid "Toggle whether to show the shortcut bar"
+msgstr ""
+
+#: ui/evolution.xml.h:20
+msgid "Using the C_ontact Manager"
+msgstr ""
+
+#: ui/evolution.xml.h:21
+msgid "Using the _Calendar"
+msgstr ""
+
+#: ui/evolution.xml.h:22
+msgid "Using the _Mailer"
+msgstr ""
+
+#: ui/evolution.xml.h:23
+msgid "Work Offline"
+msgstr ""
+
+#: ui/evolution.xml.h:24
+msgid "_About Evolution..."
+msgstr ""
+
+#: ui/evolution.xml.h:25
+msgid "_Actions"
+msgstr ""
+
+#: ui/evolution.xml.h:32
+msgid "_Folder Bar"
+msgstr ""
+
+#: ui/evolution.xml.h:33
+msgid "_Go to Folder..."
+msgstr ""
+
+#: ui/evolution.xml.h:35
+msgid "_Import file..."
+msgstr ""
+
+#: ui/evolution.xml.h:36
+msgid "_Index"
+msgstr ""
+
+#: ui/evolution.xml.h:37
+msgid "_Mail message"
+msgstr ""
+
+#: ui/evolution.xml.h:39
+msgid "_New Folder"
+msgstr ""
+
+#: ui/evolution.xml.h:40
+msgid "_Shortcut Bar"
+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:2475
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
 msgid "Tentative"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
 msgid "_Invite Others..."
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
 msgid "_Options"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
 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:459
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
 msgid "_<<"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
 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:556
 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:569
 msgid "_Required People"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
 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:605
 msgid "Meeting _start time:"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
 msgid "Meeting _end time:"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
 msgid "All Attendees"
 msgstr ""
 
+#: widgets/menus/gal-view-menus.c:177
+msgid "_Current View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:196
+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
@@ -4844,62 +8271,150 @@ msgid "MTWTFSS"
 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
+#: 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
+msgid "Now"
+msgstr ""
+
+#: widgets/misc/e-cell-date-edit.c:242
+msgid "OK"
+msgstr ""
+
+#: widgets/misc/e-cell-date-edit.c:723
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
+#: widgets/misc/e-filter-bar.c:166
+msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
+#: widgets/misc/e-filter-bar.c:237
+msgid "Advanced Search"
 msgstr ""
 
-#. 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"
+#: widgets/misc/e-filter-bar.c:317
+msgid "Advanced ..."
 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"
+#: widgets/misc/e-messagebox.c:152
+msgid "Information"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:176
+#: 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:148
 msgid "Sear_ch"
 msgstr ""
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
+#: views/addressbook/galview.xml.h:1
+msgid "Adress 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 ""
 
-#~ msgid "_ZIP Code:"
-#~ msgstr "_Post Code:"
+#: 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 ""
+
+#: 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 "Evolution calendar executive summary component."
-#~ msgstr "Cannot initialise Evolution's mail summary component."
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "Could not initialise Bonobo"
 
+#: wombat/wombat.c:185
 #, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
+msgid "init_corba(): could not initialize GNOME"
+msgstr "Could not initialise Bonobo"
+
+#: wombat/wombat.c:198
+#, fuzzy
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "Could not initialise Bonobo"
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's notes component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
-#~ msgid "Colors"
-#~ msgstr "Colours"
+#, fuzzy
+#~ msgid "Notes Component: Could not initialize bonobo"
+#~ msgstr "Could not initialise Bonobo"
+
+#~ msgid "Synchronize"
+#~ msgstr "Synchronise"
 
-#~ msgid "Pick a color"
-#~ msgstr "Pick a colour"
+#~ msgid "Synchronize Action"
+#~ msgstr "Synchronise Action"
 
-#~ msgid "Organization:"
-#~ msgstr "Organisation:"
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Mr.\n"
+#~ "Mrs.\n"
+#~ "Ms.\n"
+#~ "Miss\n"
+#~ "Dr.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Mr\n"
+#~ "Ms\n"
+#~ "Miss\n"
+#~ "Mrs\n"
+#~ "Dr\n"
+#~ "Prof\n"
+#~ "Rev\n"
 
 #~ msgid ""
 #~ "Enter your name and email address to be used in outgoing mail. You may also, "
diff --git a/po/es.po b/po/es.po
index 94ccd6c8b1..7f2025097f 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-04-12 17:15+0200\n"
+"POT-Creation-Date: 2001-04-14 08:51-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"
@@ -14,11 +14,11 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3269
+#: addressbook/backend/ebook/e-card.c:3209
 msgid "Card: "
 msgstr "Tarjeta: "
 
-#: addressbook/backend/ebook/e-card.c:3271
+#: addressbook/backend/ebook/e-card.c:3211
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +26,7 @@ msgstr ""
 "\n"
 "Nombre:"
 
-#: addressbook/backend/ebook/e-card.c:3272
+#: addressbook/backend/ebook/e-card.c:3212
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +34,7 @@ msgstr ""
 "\n"
 "  Prefijo:    "
 
-#: addressbook/backend/ebook/e-card.c:3273
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +42,7 @@ msgstr ""
 "\n"
 "  Dado:       "
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3214
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +50,7 @@ msgstr ""
 "\n"
 "  Adicional:  "
 
-#: addressbook/backend/ebook/e-card.c:3275
+#: addressbook/backend/ebook/e-card.c:3215
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +58,7 @@ msgstr ""
 "\n"
 "  Familia:    "
 
-#: addressbook/backend/ebook/e-card.c:3276
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +66,7 @@ msgstr ""
 "\n"
 "  Sufijo:     "
 
-#: addressbook/backend/ebook/e-card.c:3290
+#: addressbook/backend/ebook/e-card.c:3230
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +74,7 @@ msgstr ""
 "\n"
 "Fecha de nacimiento: "
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3241
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +82,7 @@ msgstr ""
 "\n"
 "Direcci�n:"
 
-#: addressbook/backend/ebook/e-card.c:3303
+#: addressbook/backend/ebook/e-card.c:3243
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,7 +90,7 @@ msgstr ""
 "\n"
 "  Direcci�n postal: "
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3244
 msgid ""
 "\n"
 "  Ext:         "
@@ -98,7 +98,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3305
+#: addressbook/backend/ebook/e-card.c:3245
 msgid ""
 "\n"
 "  Street:      "
@@ -106,7 +106,7 @@ msgstr ""
 "\n"
 "  Calle:       "
 
-#: addressbook/backend/ebook/e-card.c:3306
+#: addressbook/backend/ebook/e-card.c:3246
 msgid ""
 "\n"
 "  City:        "
@@ -114,7 +114,7 @@ msgstr ""
 "\n"
 "  Ciudad:      "
 
-#: addressbook/backend/ebook/e-card.c:3307
+#: addressbook/backend/ebook/e-card.c:3247
 msgid ""
 "\n"
 "  Region:      "
@@ -122,7 +122,7 @@ msgstr ""
 "\n"
 "  Regi�n:      "
 
-#: addressbook/backend/ebook/e-card.c:3308
+#: addressbook/backend/ebook/e-card.c:3248
 msgid ""
 "\n"
 "  Postal Code: "
@@ -130,7 +130,7 @@ msgstr ""
 "\n"
 "  C�digo postal: "
 
-#: addressbook/backend/ebook/e-card.c:3309
+#: addressbook/backend/ebook/e-card.c:3249
 msgid ""
 "\n"
 "  Country:     "
@@ -138,7 +138,7 @@ msgstr ""
 "\n"
 "  Pa�s:        "
 
-#: addressbook/backend/ebook/e-card.c:3322
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "Delivery Label: "
@@ -146,7 +146,7 @@ msgstr ""
 "\n"
 "Etiqueta de env�o: "
 
-#: addressbook/backend/ebook/e-card.c:3334
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "Telephones:\n"
@@ -154,7 +154,7 @@ msgstr ""
 "\n"
 "Tel�fonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3277
 msgid ""
 "\n"
 "Telephone:"
@@ -162,7 +162,7 @@ msgstr ""
 "\n"
 "Tel�fono:"
 
-#: addressbook/backend/ebook/e-card.c:3361
+#: addressbook/backend/ebook/e-card.c:3301
 msgid ""
 "\n"
 "E-mail:\n"
@@ -170,7 +170,7 @@ msgstr ""
 "\n"
 "Correo electr�nico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3364
+#: addressbook/backend/ebook/e-card.c:3304
 msgid ""
 "\n"
 "E-mail:"
@@ -178,7 +178,7 @@ msgstr ""
 "\n"
 "Correo electr�nico:"
 
-#: addressbook/backend/ebook/e-card.c:3383
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Mailer: "
@@ -186,7 +186,7 @@ msgstr ""
 "\n"
 "Programa de correo: "
 
-#: addressbook/backend/ebook/e-card.c:3389
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "Time Zone: "
@@ -194,7 +194,7 @@ msgstr ""
 "\n"
 "Zona horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3397
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Geo Location: "
@@ -202,7 +202,7 @@ msgstr ""
 "\n"
 "Localizaci�n geogr�fica: "
 
-#: addressbook/backend/ebook/e-card.c:3401
+#: addressbook/backend/ebook/e-card.c:3341
 msgid ""
 "\n"
 "Business Role: "
@@ -210,7 +210,7 @@ msgstr ""
 "\n"
 "Cargo: "
 
-#: addressbook/backend/ebook/e-card.c:3413
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "Org: "
@@ -218,7 +218,7 @@ msgstr ""
 "\n"
 "Organizaci�n: "
 
-#: addressbook/backend/ebook/e-card.c:3414
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Name:  "
@@ -226,7 +226,7 @@ msgstr ""
 "\n"
 "  Nombre: "
 
-#: addressbook/backend/ebook/e-card.c:3415
+#: addressbook/backend/ebook/e-card.c:3355
 msgid ""
 "\n"
 "  Unit:  "
@@ -234,7 +234,7 @@ msgstr ""
 "\n"
 "  Unidad: "
 
-#: addressbook/backend/ebook/e-card.c:3416
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "  Unit2: "
@@ -242,7 +242,7 @@ msgstr ""
 "\n"
 "  Unidad2: "
 
-#: addressbook/backend/ebook/e-card.c:3417
+#: addressbook/backend/ebook/e-card.c:3357
 msgid ""
 "\n"
 "  Unit3: "
@@ -250,7 +250,7 @@ msgstr ""
 "\n"
 "  Unidad3: "
 
-#: addressbook/backend/ebook/e-card.c:3418
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Unit4: "
@@ -258,7 +258,7 @@ msgstr ""
 "\n"
 "  Unidad4: "
 
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3362
 msgid ""
 "\n"
 "Categories: "
@@ -266,7 +266,7 @@ msgstr ""
 "\n"
 "categor�as: "
 
-#: addressbook/backend/ebook/e-card.c:3423
+#: addressbook/backend/ebook/e-card.c:3363
 msgid ""
 "\n"
 "Comment: "
@@ -284,7 +284,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3436
+#: addressbook/backend/ebook/e-card.c:3376
 msgid ""
 "\n"
 "Unique String: "
@@ -292,7 +292,7 @@ msgstr ""
 "\n"
 "Cadena �nica: "
 
-#: addressbook/backend/ebook/e-card.c:3439
+#: addressbook/backend/ebook/e-card.c:3379
 msgid ""
 "\n"
 "Public Key: "
@@ -312,7 +312,7 @@ msgstr "Importa archivos de GnomeCard a Evolution."
 #: 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:1090
+#: 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
@@ -328,20 +328,20 @@ msgstr "No pude cargar el cursor\n"
 msgid "EBook not loaded\n"
 msgstr "EBook no esta cargado\n"
 
-#: addressbook/conduit/address-conduit.c:652
+#: addressbook/conduit/address-conduit.c:654
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "No se ha podido iniciar el servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:653
+#: addressbook/conduit/address-conduit.c:655
 #: calendar/conduits/calendar/calendar-conduit.c:732
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "No se puede inicializar wombat"
 
-#: addressbook/conduit/address-conduit.c:685
-#: addressbook/conduit/address-conduit.c:688
+#: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:690
 msgid "Could not read pilot's Address application block"
 msgstr "No pude leer informaci�n de la aplicaci�n de direcciones del pilot"
 
@@ -445,7 +445,7 @@ msgstr "_Compa��a:"
 
 #: 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
+#: ui/evolution-mail.xml.h:91 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -948,7 +948,7 @@ msgstr "Fuentes de la agenda de direcciones"
 #: 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:6 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Borrar"
 
@@ -1038,7 +1038,7 @@ msgstr "Factor�a para la interfaz de selecci�n de nombre de la Agenda"
 
 #: 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:547 filter/filter.glade.h:9
+#: 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"
@@ -1196,7 +1196,7 @@ msgstr "Enviar un mensaje al contacto"
 #: 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:29
+#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:50
 #: ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Imprimir"
@@ -1580,20 +1580,20 @@ msgstr "W"
 
 #: 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:627
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
 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:626
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
 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:625
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
 msgid "Low"
 msgstr "Baja"
 
@@ -1662,7 +1662,7 @@ 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:968
+#: 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
@@ -2314,77 +2314,77 @@ 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:274 calendar/gui/e-day-view.c:1290
+#: 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 %b 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:1304
+#: 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 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:282 calendar/gui/e-day-view.c:1317
+#: 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 de %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:302
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
 #: calendar/gui/print.c:617
 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:305
+#: 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-day-view.c:3036 ui/evolution-calendar.xml.h:16
+#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 msgid "New Appointment"
 msgstr "Nueva cita"
 
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3242
+#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
 msgid "New All Day Event"
 msgstr "Nuevo evento para todo el d�a"
 
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3247
+#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
 msgid "Go to Today"
 msgstr "Ir a hoy"
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3249
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
 msgid "Go to Date..."
 msgstr "Ir a una fecha..."
 
-#: calendar/gui/e-day-view.c:3052 calendar/gui/e-week-view.c:3255
+#: 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 "Abrir"
 
-#: calendar/gui/e-day-view.c:3054 calendar/gui/e-week-view.c:3257
+#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
 msgid "Delete this Appointment"
 msgstr "Borrar esta Cita"
 
-#: calendar/gui/e-day-view.c:3056 calendar/gui/e-week-view.c:3259
+#: 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 "Concertar encuentro"
 
-#: calendar/gui/e-day-view.c:3065 calendar/gui/e-week-view.c:3272
+#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
 msgid "Make this Occurrence Movable"
 msgstr "Hacer esta Ocurrencia Movible"
 
-#: calendar/gui/e-day-view.c:3067 calendar/gui/e-week-view.c:3274
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
 msgid "Delete this Occurrence"
 msgstr "Borrar esta Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3069
+#: calendar/gui/e-day-view.c:3179
 msgid "Delete all Occurrences"
 msgstr "Borrar todas las Ocurrencias"
 
@@ -2469,7 +2469,7 @@ msgstr "--to--"
 msgid "Calendar Message"
 msgstr "Mensaje del Calendario"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:613
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
 msgid "Date:"
 msgstr "Fecha:"
 
@@ -2573,8 +2573,8 @@ msgstr ""
 "Concertar\n"
 "Hora"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:30
-#: mail/message-list.c:1019
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
+#: mail/message-list.c:1052
 msgid "Status"
 msgstr "Estado"
 
@@ -2604,11 +2604,11 @@ msgstr "El m�todo necesario para cargar `%s' no esta soportado"
 msgid "%d %B"
 msgstr "%d de %B"
 
-#: calendar/gui/e-week-view.c:3240 calendar/gui/e-week-view.c:3263
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
 msgid "New Appointment..."
 msgstr "Nueva Cita..."
 
-#: calendar/gui/e-week-view.c:3276
+#: calendar/gui/e-week-view.c:3314
 msgid "Delete All Occurrences"
 msgstr "Borrar todas las Ocurrencias"
 
@@ -2700,11 +2700,11 @@ msgstr "Hora de _inicio:"
 msgid "_Starting date:"
 msgstr "Fecha de Ini_cio:"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
 msgid "after"
 msgstr "despu�s de"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
 msgid "before"
 msgstr "antes"
 
@@ -3134,7 +3134,7 @@ msgstr "Imprimir calendario"
 
 #: 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:30
+#: ui/evolution-mail.xml.h:52
 msgid "Print Preview"
 msgstr "Vista previa"
 
@@ -3184,6 +3184,31 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DLMMJVS"
 
+#: camel/camel-cipher-context.c:169
+#, fuzzy
+msgid "Signing is not supported by this cipher"
+msgstr "El tipo especificado no esta soportado por este manejador"
+
+#: camel/camel-cipher-context.c:207
+#, fuzzy
+msgid "Clearsigning is not supported by this cipher"
+msgstr "El tipo especificado no esta soportado por este manejador"
+
+#: camel/camel-cipher-context.c:245
+#, fuzzy
+msgid "Verifying is not supported by this cipher"
+msgstr "El tipo especificado no esta soportado por este manejador"
+
+#: camel/camel-cipher-context.c:286
+#, fuzzy
+msgid "Encryption is not supported by this cipher"
+msgstr "El tipo especificado no esta soportado por este manejador"
+
+#: camel/camel-cipher-context.c:326
+#, fuzzy
+msgid "Decryption is not supported by this cipher"
+msgstr "El tipo especificado no esta soportado por este manejador"
+
 #: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
 msgid "Syncing folders"
 msgstr "Sincronizando carpetas"
@@ -3218,11 +3243,12 @@ msgid "Complete"
 msgstr "Completo"
 
 #: camel/camel-filter-driver.c:748
+#, c-format
 msgid "Getting message %d of %d"
 msgstr "Obteniendo mensaje %d de %d"
 
-
 #: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#, c-format
 msgid "Failed at message %d of %d"
 msgstr "Error en el mensaje %d de %d"
 
@@ -3236,7 +3262,7 @@ msgstr "Error parseando filtro: %s: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "Error ejecutando filtro: %s: %s"
 
-#: camel/camel-filter-search.c:431 camel/camel-filter-search.c:437
+#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error ejecutando la b�squeda del filtro: %s: %s"
@@ -3353,6 +3379,58 @@ msgstr "(Error desconocido)"
 msgid "Error copying mail temp file: %s"
 msgstr "Error copiando el correo al archivo temporal: %s"
 
+#: camel/camel-pgp-context.c:186
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Por favor introduzca su frase de paso%s %s"
+
+#: camel/camel-pgp-context.c:189
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Por favor introduzca su frase de paso %s"
+
+#: camel/camel-pgp-context.c:509
+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
+msgid "No password provided."
+msgstr "No se dio contrase�a"
+
+#: 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
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "No pude comunicar con GPG/PGP: %s"
+
+#: camel/camel-pgp-context.c:681
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:871
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:888
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "No pude crear archivo temporal: %s"
+
+#: camel/camel-pgp-context.c:1011
+#, fuzzy
+msgid "No plaintext to encrypt."
+msgstr "Pulse el icono para desencriptar."
+
+#: camel/camel-pgp-context.c:1037
+msgid "No recipients specified"
+msgstr "No ha especificado destinatarios"
+
+#: camel/camel-pgp-context.c:1227
+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."
@@ -3369,37 +3447,37 @@ msgstr "No puedo cargar %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "No pude cagar %s: No hay c�digo de inicializaci�n en el m�dulo."
 
-#: camel/camel-remote-store.c:189
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s server %s"
 msgstr "%s servidor %s"
 
-#: camel/camel-remote-store.c:193
+#: camel/camel-remote-store.c:190
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s servicio para %s en %s"
 
-#: camel/camel-remote-store.c:243
+#: camel/camel-remote-store.c:240
 msgid "Connection cancelled"
 msgstr "Conexi�n cancelada"
 
-#: camel/camel-remote-store.c:246
+#: camel/camel-remote-store.c:243
 #: camel/providers/smtp/camel-smtp-transport.c:261
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No pude conectar con %s (puerto %d): %s"
 
-#: camel/camel-remote-store.c:247
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(servidor desconocido)"
 
-#: camel/camel-remote-store.c:328 camel/camel-remote-store.c:390
-#: camel/camel-remote-store.c:461
+#: 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
 msgid "Operation cancelled"
 msgstr "Operaci�n cancelada"
 
-#: camel/camel-remote-store.c:467
+#: camel/camel-remote-store.c:464
 msgid "Server unexpectedly disconnected"
 msgstr "El servidor se desconect� inesperadamente"
 
@@ -3581,17 +3659,18 @@ msgstr ""
 "%s"
 
 #. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:995 mail/mail-ops.c:1002
-#: mail/mail-ops.c:1020 mail/mail-ops.c:1021
+#: 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 "Papelera"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "No pude analizar la URL `%s'"
 
 #: camel/camel-vee-folder.c:451
+#, c-format
 msgid "No such message %s in %s"
 msgstr "No existe el mensaje %s en %s"
 
@@ -3709,7 +3788,6 @@ msgid "You didn't enter a password."
 msgstr "No escribi� una clave."
 
 #: camel/providers/imap/camel-imap-store.c:518
-#: camel/providers/smtp/camel-smtp-transport.c:411
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3720,17 +3798,17 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:858
+#: camel/providers/imap/camel-imap-store.c:865
 #, c-format
 msgid "%s is not a selectable folder"
 msgstr "%s no es una carpeta seleccionable"
 
-#: camel/providers/imap/camel-imap-store.c:872
+#: camel/providers/imap/camel-imap-store.c:879
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No puedo crear el directorio %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1373
+#: camel/providers/imap/camel-imap-store.c:1382
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar trabajando en l�nea para competar esta operaci�n"
 
@@ -3970,7 +4048,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "No puedo resumir la carpeta: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1383
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
 msgid "Synchronising folder"
 msgstr "Sincronizando carpeta"
 
@@ -4405,6 +4483,17 @@ msgstr "El servidor SMTP %s no soporta el m�todo de autenticaci�n requerido %s"
 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:411
+#, fuzzy, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"No pude autentificarme en el servidor IMAP.\n"
+"%s\n"
+"\n"
+
 #: camel/providers/smtp/camel-smtp-transport.c:527
 #, c-format
 msgid "SMTP server %s"
@@ -4561,7 +4650,7 @@ msgstr "Incluir adjunto..."
 msgid "Attach a file to the message"
 msgstr "Adjuntar un fichero al mensaje"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1019
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
 msgid "Attachment"
 msgstr "Adjunto"
 
@@ -4592,25 +4681,25 @@ msgstr "Presione aqu� para acceder a la agenda"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:709
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:711
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
 msgid "Reply-To:"
 msgstr "Responder a:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:633
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:713
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
 msgid "To:"
 msgstr "A:"
 
@@ -4618,7 +4707,7 @@ msgstr "A:"
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:715
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -5120,7 +5209,7 @@ msgstr ""
 "Por favor vuelve y especifica una carpeta v�lida donde entregar el correo."
 
 #: filter/filter-folder.c:222 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:678
+#: mail/mail-account-gui.c:682
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
@@ -5145,31 +5234,31 @@ msgstr ""
 msgid "Test"
 msgstr "Prueba"
 
-#: filter/filter-rule.c:624
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Nombre de la regla:"
 
-#: filter/filter-rule.c:628
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "Sin t�tulo"
 
-#: filter/filter-rule.c:644
+#: filter/filter-rule.c:646
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:662
+#: filter/filter-rule.c:664
 msgid "Execute actions"
 msgstr "Ejecutar acciones"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:668
 msgid "if all criteria are met"
 msgstr "si se cumplen todos los criterios"
 
-#: filter/filter-rule.c:671
+#: filter/filter-rule.c:673
 msgid "if any criteria are met"
 msgstr "si se cumple alg�n criterio"
 
-#: filter/filter-rule.c:682
+#: filter/filter-rule.c:684
 msgid "Add criterion"
 msgstr "A�adir criterio"
 
@@ -5267,139 +5356,154 @@ msgid "Important"
 msgstr "Importante"
 
 #: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "Is Not"
+msgstr "no es"
+
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Is"
+msgstr "I"
+
+#: filter/libfilter-i18n.h:18
 msgid "Mailing list"
 msgstr "Lista de correo"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
 msgid "Message Body"
 msgstr "Cuerpo del mensaje"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:20
 msgid "Message Header"
 msgstr "Cabecera del mensaje"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:21
 msgid "Message was received"
 msgstr "Se recibi� el mensaje"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:22
 msgid "Message was sent"
 msgstr "Se envi� el mensaje"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:23
 msgid "Move to Folder"
 msgstr "Mover a la carpeta"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:24
 msgid "Read"
 msgstr "Le�do"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:25
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:26
 msgid "Regex Match"
 msgstr "Expresi�n regular"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:27
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:26 filter/score-rule.c:203 filter/score-rule.c:205
-#: mail/message-list.c:1019
+#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
+#: mail/message-list.c:1052
 msgid "Score"
 msgstr "Puntuaci�n"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:29
 msgid "Sender"
 msgstr "Remitente"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:30
 msgid "Set Status"
 msgstr "Poner estado"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "Source Account"
+msgstr "Cuenta"
+
+#: filter/libfilter-i18n.h:32
 msgid "Specific header"
 msgstr "Cabecera espec�fica"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:34
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:32 mail/message-list.c:1020
+#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
 msgid "Subject"
 msgstr "Asunto"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:38
 msgid "contains"
 msgstr "contiene"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:39
 msgid "does not contain"
 msgstr "no contiene"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:40
 msgid "does not end with"
 msgstr "no acaba en"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
 msgid "does not exist"
 msgstr "no existe"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42
 msgid "does not sound like"
 msgstr "no suena como"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 msgid "does not start with"
 msgstr "no comienza por"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:44
 msgid "ends with"
 msgstr "finaliza con"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:45
 msgid "exists"
 msgstr "existe"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 msgid "is greater than"
 msgstr "es mayor que"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 msgid "is less than"
 msgstr "es menor que"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "is not"
 msgstr "no es"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 msgid "is"
 msgstr "es"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "on or after"
 msgstr "en o despu�s de"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "on or before"
 msgstr "en o antes de"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
 msgid "sounds like"
 msgstr "suena como"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "comienza por"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:54
 msgid "was after"
 msgstr "estaba despu�s de"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:55
 msgid "was before"
 msgstr "estaba antes de"
 
@@ -5407,11 +5511,11 @@ msgstr "estaba antes de"
 msgid "Score Rules"
 msgstr "Reglas de puntuaci�n"
 
-#: mail/component-factory.c:332
+#: mail/component-factory.c:329
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:405
+#: mail/component-factory.c:402
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
@@ -5473,15 +5577,15 @@ msgstr "Guardar como..."
 msgid "Reply to Sender"
 msgstr "Resp. Remitente"
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:36
+#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
 msgid "Reply to All"
 msgstr "Re: Todos"
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:14
+#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
 msgid "Forward"
 msgstr "Reenviar"
 
-#: mail/folder-browser.c:583
+#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
 msgid "Forward inline"
 msgstr "Reenviar dentro del mensaje"
 
@@ -5501,7 +5605,7 @@ msgstr "Mover a la carpeta..."
 msgid "Copy to Folder..."
 msgstr "Copiar a la carpeta..."
 
-#: mail/folder-browser.c:599
+#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
 msgid "Undelete"
 msgstr "Recuperar"
 
@@ -5509,7 +5613,7 @@ msgstr "Recuperar"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:609
+#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
 msgid "Apply Filters"
 msgstr "Aplicar filtro"
 
@@ -5762,7 +5866,7 @@ msgstr ""
 "Error cargando la informaci�n del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1302
+#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
@@ -6082,74 +6186,74 @@ msgstr "Ver incluido (v�a %s)"
 msgid "Hide"
 msgstr "Ocultar"
 
-#: mail/mail-display.c:1100
+#: mail/mail-display.c:1102
 msgid "Open link in browser"
 msgstr "Abrir enlaze en el navegador"
 
-#: mail/mail-display.c:1102
+#: mail/mail-display.c:1104
 msgid "Save as (FIXME)"
 msgstr "Guardar como (ARREGLAME)"
 
-#: mail/mail-display.c:1104
+#: mail/mail-display.c:1106
 msgid "Copy location (FIXME)"
 msgstr "Copiar direcci�n (ARREGLAME)"
 
-#: mail/mail-format.c:512
+#: mail/mail-format.c:518
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/mail-format.c:554
+#: mail/mail-format.c:560
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No puede analizar el mensaje MIME. Mostrando la fuente."
 
-#: mail/mail-format.c:736
+#: mail/mail-format.c:742
 msgid "Loading message content"
 msgstr "Cargando el contenido del mensaje"
 
-#: mail/mail-format.c:1033
+#: mail/mail-format.c:1046
 msgid "Encrypted message not displayed"
 msgstr "Mensaje encriptado no mostrado"
 
-#: mail/mail-format.c:1039
+#: mail/mail-format.c:1052
 msgid "Encrypted message"
 msgstr "Mensaje encriptado"
 
-#: mail/mail-format.c:1040
+#: mail/mail-format.c:1053
 msgid "Click icon to decrypt."
 msgstr "Pulse el icono para desencriptar."
 
-#: mail/mail-format.c:1109 mail/mail-format.c:1496
+#: mail/mail-format.c:1137 mail/mail-format.c:1526
 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:1117 mail/mail-format.c:1504
+#: mail/mail-format.c:1145 mail/mail-format.c:1534
 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:1717
+#: mail/mail-format.c:1747
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:1729
+#: mail/mail-format.c:1759
 #, 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:1733
+#: mail/mail-format.c:1763
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:1767
+#: mail/mail-format.c:1797
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo \"%s\")"
 
-#: mail/mail-format.c:1772
+#: mail/mail-format.c:1802
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
@@ -6241,93 +6345,93 @@ msgstr "�Acepta?"
 msgid "Evolution progress"
 msgstr "Progreso de Evolution"
 
-#: mail/mail-ops.c:588
+#: mail/mail-ops.c:587
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:590
+#: mail/mail-ops.c:589
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: mail/mail-ops.c:705
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: mail/mail-ops.c:724
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Error en mensaje %d de %d"
 
-#: mail/mail-ops.c:726 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:812
+#: mail/mail-ops.c:811
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:885
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:885
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:900
 msgid "Moving"
 msgstr "Moviendo"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:903
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:979
+#: mail/mail-ops.c:978
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Escaneando carpetas en \"%s\""
 
-#: mail/mail-ops.c:1140
+#: mail/mail-ops.c:1139
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1181 mail/mail-ops.c:1319
+#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1247
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1435
+#: mail/mail-ops.c:1434
 msgid "Expunging folder"
 msgstr "Comprimiendo carpeta"
 
-#: mail/mail-ops.c:1484
+#: mail/mail-ops.c:1483
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recogiendo mensaje %s"
 
-#: mail/mail-ops.c:1551
+#: mail/mail-ops.c:1550
 msgid "Retrieving messages"
 msgstr "Recogiendo mensajes"
 
-#: mail/mail-ops.c:1561
+#: mail/mail-ops.c:1560
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Recogiendo mensaje n�mero %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1635
+#: mail/mail-ops.c:1634
 msgid "Saving messages"
 msgstr "Guardando mensajes"
 
-#: mail/mail-ops.c:1714
+#: mail/mail-ops.c:1713
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6336,12 +6440,12 @@ msgstr ""
 "No pude crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1727
+#: mail/mail-ops.c:1726
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Guardando mensaje %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1741
+#: mail/mail-ops.c:1740
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6350,11 +6454,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1815
+#: mail/mail-ops.c:1814
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:1830
+#: mail/mail-ops.c:1829
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6363,7 +6467,7 @@ msgstr ""
 "No pude crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1858
+#: mail/mail-ops.c:1857
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No pude escribir datos: %s"
@@ -6446,149 +6550,114 @@ msgstr "Nueva carpeta virtual"
 
 #. 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:35
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:39
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
 msgid "Reply to the sender of this message"
 msgstr "Responder al remitente de este mensaje"
 
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
 msgid "Reply to all recipients of this message"
 msgstr "Responder a todos los destinatarios de este mensaje"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:16
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
 msgid "Forward this message"
 msgstr "Reenviar este mensaje"
 
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:32
+#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
 msgid "Print the selected message"
 msgstr "Imprimir el mensaje seleccionado"
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:7
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Borrar este mensaje"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:648
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:649
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:650
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:618
+#: mail/message-list.c:651
 msgid "Multiple Unseen Messages"
 msgstr "Multiples mensajes sin leer"
 
-#: mail/message-list.c:619
+#: mail/message-list.c:652
 msgid "Multiple Messages"
 msgstr "Multiples mensajes"
 
-#: mail/message-list.c:623
+#: mail/message-list.c:656
 msgid "Lowest"
 msgstr "La m�s baja"
 
-#: mail/message-list.c:624
+#: mail/message-list.c:657
 msgid "Lower"
 msgstr "M�s baja"
 
-#: mail/message-list.c:628
+#: mail/message-list.c:661
 msgid "Higher"
 msgstr "M�s alta"
 
-#: mail/message-list.c:629
+#: mail/message-list.c:662
 msgid "Highest"
 msgstr "La m�s alta"
 
-#: mail/message-list.c:879
+#: mail/message-list.c:912
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:886
+#: mail/message-list.c:919
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:895
+#: mail/message-list.c:928
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:907
+#: mail/message-list.c:940
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:948
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:917
+#: mail/message-list.c:950
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1052
 msgid "Flagged"
 msgstr "Marcado"
 
-#: mail/message-list.c:1020
+#: mail/message-list.c:1053
 msgid "From"
 msgstr "De"
 
-#: mail/message-list.c:1020
+#: mail/message-list.c:1053
 msgid "Date"
 msgstr "Fecha"
 
-#: mail/message-list.c:1020
+#: mail/message-list.c:1053
 msgid "Received"
 msgstr "Recibido"
 
-#: mail/message-list.c:1021
+#: mail/message-list.c:1054
 msgid "To"
 msgstr "A"
 
-#: mail/message-list.c:1021
+#: mail/message-list.c:1054
 msgid "Size"
 msgstr "Tama�o"
 
-#: mail/openpgp-utils.c:92
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Por favor introduzca su frase de paso%s %s"
-
-#: mail/openpgp-utils.c:95
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Por favor introduzca su frase de paso %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
-msgid "No GPG/PGP program available."
-msgstr "No hay programas disponibles de 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 "No se dio contrase�a"
-
-#: 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 "No pude comunicar con GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:592
-msgid "No recipients specified"
-msgstr "No ha especificado destinatarios"
-
-#: mail/openpgp-utils.c:1093
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "No pude crear archivo temporal: %s"
-
 #: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
 msgid "Folder"
 msgstr "Carpeta"
@@ -6691,6 +6760,7 @@ msgstr ""
 "Comenzando %s"
 
 #: shell/importer/importer.c:372
+#, c-format
 msgid "Error starting %s"
 msgstr "Error cargando %s"
 
@@ -7110,8 +7180,7 @@ msgstr "Desahilitar pantalla de entrada"
 
 #: shell/main.c:186
 msgid "Send the debugging output of all components to a file."
-msgstr ""
-"Enviar la salida de depurado de todos los componente a un archivo."
+msgstr "Enviar la salida de depurado de todos los componente a un archivo."
 
 #: shell/main.c:219
 msgid "Cannot initialize the Bonobo component system."
@@ -7137,7 +7206,7 @@ msgstr "Buscar un contacto"
 msgid "New contact"
 msgstr "Nuevo contacto"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:28
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
 msgid "Previews the message to be printed"
 msgstr "Ver el mensaje que va a ser impreso"
 
@@ -7145,7 +7214,7 @@ msgstr "Ver el mensaje que va a ser impreso"
 msgid "Print contacts"
 msgstr "Imprimir contactos"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:48
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
 msgid "Stop"
 msgstr "Parar"
 
@@ -7179,7 +7248,7 @@ msgid "_Search for contacts"
 msgstr "Bu_scar 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:78
+#: 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"
 msgstr "_Herramientas"
@@ -7327,7 +7396,7 @@ msgstr "_Nuevo"
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:75
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
 #: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "Guardar _como..."
@@ -7358,7 +7427,7 @@ 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:33 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Imprimir..."
 
@@ -7446,7 +7515,7 @@ msgstr "Cerrar esta cita"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "Cop_y to Folder... (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
+#: 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"
@@ -7557,7 +7626,8 @@ msgstr "Concertar un _encuentro"
 msgid "Schedule some sort of a meeting"
 msgstr "Programas alg�n tipo de encuentro"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+#: 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 "Seleccionar todo"
 
@@ -7635,7 +7705,7 @@ msgstr "_Pegar"
 msgid "_Print"
 msgstr "Im_primir"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:71
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Propiedades..."
@@ -7673,123 +7743,246 @@ msgstr "Configuraci�n del Resumen de Trabajo..."
 msgid "New Mail"
 msgstr "Nuevo"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-mail.xml.h:2
+#, fuzzy
+msgid "Apply any new filters to the mail in this box"
+msgstr "Aplicar filtros a los mensajes nuevos en INBOX en este servidor"
+
+#: ui/evolution-mail.xml.h:3
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:4
 msgid "Compose"
 msgstr "Nuevo"
 
-#: ui/evolution-mail.xml.h:2
+#: ui/evolution-mail.xml.h:5
 msgid "Compose a new message"
 msgstr "Escribir un nuevo mensaje"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Configure Folder..."
+msgstr "Mover a la carpeta..."
+
+#: ui/evolution-mail.xml.h:8
 msgid "Copy message to a new folder"
 msgstr "Copiar mensaje a una nueva carpeta"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail.xml.h:9
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Copiar mensaje a una nueva carpeta"
+
+#: ui/evolution-mail.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Crear una Carpeta _Virtual seg�n el mensaje"
 
-#: ui/evolution-mail.xml.h:8
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Delete the selected messages"
+msgstr "Imprimir el mensaje seleccionado"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Display all of the message headers"
 msgstr "Mostrar la cabecera de los mensajes"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:15
+#, fuzzy
+msgid "Edit Message"
+msgstr "Imprimir mensaje"
+
+#: ui/evolution-mail.xml.h:16
+#, fuzzy
+msgid "Edit the current message"
+msgstr "la fecha actual"
+
+#: ui/evolution-mail.xml.h:17
 msgid "Empty _Trash"
 msgstr "Vaciar _Papelera"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Expunge"
+msgstr "_Comprimir"
+
+#: ui/evolution-mail.xml.h:19
 msgid "Filter on Se_nder"
 msgstr "Filtrar seg�n el remite_nte"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:20
 msgid "Filter on _Recipients"
 msgstr "Filtrar seg�n los destinata_rios"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:21
 msgid "Filter on _Subject"
 msgstr "Filtrar seg�n el a_sunto"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:22
+msgid "Finaly remove all mails tagged for deletion"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:23
 msgid "Forget _Passwords"
 msgstr "Olvidar _contrase�a"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:25
 msgid "Forward As"
 msgstr "Reenviar como"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail.xml.h:27
+msgid "Forward the selected mail to someone"
+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.xml.h:30
 msgid "Full _Headers"
 msgstr "_Cabecera completa"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:31
 msgid "Hide Deleted Messages"
 msgstr "Ocultar Mensajes Borrados"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:32
 msgid "Hide S_elected Messages"
 msgstr "Ocultar los mensajes _seleccionados"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:33
 msgid "Hide _Deleted Messages"
 msgstr "Ocultar mensajes _borrados"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:34
 msgid "Hide _Read messages"
 msgstr "Ocultar mensajes _le�dos"
 
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:35
+#, fuzzy
+msgid "Invert Selection"
+msgstr "_Invertir selecci�n"
+
+#: ui/evolution-mail.xml.h:36
 msgid "Manage _Subscriptions..."
 msgstr "Administrar _suscripciones..."
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:37
 msgid "Mar_k as Read"
 msgstr "Mar_car como le�do"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:38
 msgid "Mark All as R_ead"
 msgstr "Marcar todos como l_e�dos"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:39
+#, fuzzy
+msgid "Mark As Read"
+msgstr "Marcar como le�do"
+
+#: ui/evolution-mail.xml.h:40
+#, fuzzy
+msgid "Mark As U_nread"
+msgstr "Marcar como _no le�do"
+
+#: ui/evolution-mail.xml.h:41
 msgid "Mark as U_nread"
 msgstr "Marcar como _no le�do"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:42
+#, fuzzy
+msgid "Mark the selected messages as having been read"
+msgstr "Imprimir el mensaje seleccionado"
+
+#: ui/evolution-mail.xml.h:43
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:44
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:45
 msgid "Move message to a new folder"
 msgstr "Mover mensaje a una nueva carpeta"
 
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:46
+#, fuzzy
+msgid "Move selected messages to another folder"
+msgstr "Mover mensaje a una nueva carpeta"
+
+#: ui/evolution-mail.xml.h:47
+#, fuzzy
+msgid "Open in New Window"
+msgstr "Abrir enlaze en el navegador"
+
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Open the current message in a new window"
+msgstr "Enviar el mensaje ahora"
+
+#: ui/evolution-mail.xml.h:53
+#, fuzzy
+msgid "Print Preview of message..."
+msgstr "Vista previa"
+
+#: ui/evolution-mail.xml.h:54
 msgid "Print message to the printer"
 msgstr "Imprimir el mensaje en la impresora"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:55
+#, fuzzy
+msgid "Print message..."
+msgstr "Imprimir mensaje"
+
+#: ui/evolution-mail.xml.h:58
 msgid "Redirect (FIXME: implement me)"
 msgstr "Redirigir (ARREGLAME: implementame)"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:61
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:62
+#, fuzzy
+msgid "Reply to all"
+msgstr "Re: Todos"
+
+#: ui/evolution-mail.xml.h:64
+#, fuzzy
+msgid "Reply to sender"
+msgstr "Resp. Remitente"
+
+#: ui/evolution-mail.xml.h:66
 msgid "S_ource"
 msgstr "F_uente"
 
-#: ui/evolution-mail.xml.h:41 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "Save the message into a new file"
+msgstr "Guardara el mensaje a una carpeta espec�fica"
+
+#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:70
 msgid "Select _Thread"
 msgstr "Seleccionar _Hilo"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:71
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:72
+msgid "Send a reply to the person who sent you this mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:73
+msgid "Send a single mail in reply to all the selected mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:74
 msgid ""
 "Send queued mail\n"
 "    and retrieve new mail"
@@ -7797,119 +7990,125 @@ msgstr ""
 "Enviar el correo en la cola\n"
 "    y obtener el nuevo"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:76
 msgid "Send queued mail and retrieve new mail"
 msgstr "Enviar el correo en la cola y obtener el nuevo"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:77
 msgid "Show _All"
 msgstr "Mostrar _todo"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:79
 msgid "Threaded Message list"
 msgstr "Lista de Mensajes Encadenados"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:80
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "Imprimir el mensaje seleccionado"
+
+#: ui/evolution-mail.xml.h:82
 msgid "VFolder on Se_nder"
 msgstr "VFolder seg�n el _remitente"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:83
 msgid "VFolder on _Recipients"
 msgstr "VFolder seg�n los _destinatarios"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:84
 msgid "VFolder on _Subject"
 msgstr "VFolder seg�n el a_sunto"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:85
 msgid "View Raw Message Source"
 msgstr "Ver las fuentes del mensaje"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:86
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor de carpetas virtuales..."
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:87
 msgid "_Apply Filters"
 msgstr "_Aplicar filtro"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:88
 msgid "_Attachment"
 msgstr "_Adjunto"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Compose"
-msgstr "_Componer"
-
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:89
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:90
 msgid "_Create Filter From Message"
 msgstr "_Crear filtro del mensaje"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:92
 msgid "_Expunge"
 msgstr "_Comprimir"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:93
 msgid "_Filters..."
 msgstr "_Filtros..."
 
-#: ui/evolution-mail.xml.h:63 ui/evolution.xml.h:31
+#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:95
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:96
 msgid "_Inline"
 msgstr "_Incluido en l�nea"
 
-#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Invertir selecci�n"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:98
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:99
 msgid "_Mail Settings..."
 msgstr "_Configuraci�n del correo..."
 
-#: ui/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:100
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail.xml.h:101
 msgid "_Open Selected Items"
 msgstr "Abrir element_os seleccionados"
 
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail.xml.h:103
 msgid "_Quoted"
 msgstr "_Citado"
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail.xml.h:104
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail.xml.h:105
 msgid "_Resend Messages"
 msgstr "Reenviar Mensaje"
 
-#: ui/evolution-mail.xml.h:76
+#: ui/evolution-mail.xml.h:107
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Guardar mensaje como..."
+
+#: ui/evolution-mail.xml.h:108
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:109
 msgid "_Threaded"
 msgstr "_Encadenados"
 
-#: ui/evolution-mail.xml.h:79
+#: ui/evolution-mail.xml.h:111
 msgid "_Undelete"
 msgstr "_Recuperar"
 
@@ -8393,11 +8592,11 @@ msgstr "Hora de _fin de la reuni�n:"
 msgid "All Attendees"
 msgstr "Todos los participantes"
 
-#: widgets/menus/gal-view-menus.c:178
+#: widgets/menus/gal-view-menus.c:177
 msgid "_Current View"
 msgstr "_Vista actual"
 
-#: widgets/menus/gal-view-menus.c:198
+#: widgets/menus/gal-view-menus.c:196
 msgid "Define Views"
 msgstr "Definir Vistas"
 
@@ -8518,6 +8717,12 @@ msgstr "init_corba(): no pude inicializar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonob(): no pude inicializar Bonobo"
 
+#~ msgid "No GPG/PGP program available."
+#~ msgstr "No hay programas disponibles de GPG/PGP."
+
+#~ msgid "_Compose"
+#~ msgstr "_Componer"
+
 #~ msgid "Click here to add a contact"
 #~ msgstr "Pulse aqu� para a�adir un contacto"
 
diff --git a/po/fi.po b/po/fi.po
index aa36ac2265..83b9f60345 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-04-11 22:02+0000\n"
+"POT-Creation-Date: 2001-04-14 08:51-0400\n"
 "PO-Revision-Date: 2001-04-11 15:00+0300\n"
 "Last-Translator: Jarkko Ranta <jjranta@cc.joensuu.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -13,11 +13,11 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3269
+#: addressbook/backend/ebook/e-card.c:3209
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3271
+#: addressbook/backend/ebook/e-card.c:3211
 msgid ""
 "\n"
 "Name: "
@@ -25,37 +25,37 @@ msgstr ""
 "\n"
 "Nimi: "
 
-#: addressbook/backend/ebook/e-card.c:3272
+#: addressbook/backend/ebook/e-card.c:3212
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3273
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3214
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3275
+#: addressbook/backend/ebook/e-card.c:3215
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3276
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3290
+#: addressbook/backend/ebook/e-card.c:3230
 msgid ""
 "\n"
 "Birth Date: "
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "Syntym�p�iv�: "
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3241
 msgid ""
 "\n"
 "Address:"
@@ -71,19 +71,19 @@ msgstr ""
 "\n"
 "Osoite:"
 
-#: addressbook/backend/ebook/e-card.c:3303
+#: addressbook/backend/ebook/e-card.c:3243
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3244
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3305
+#: addressbook/backend/ebook/e-card.c:3245
 msgid ""
 "\n"
 "  Street:      "
@@ -91,7 +91,7 @@ msgstr ""
 "\n"
 "  Katu:        "
 
-#: addressbook/backend/ebook/e-card.c:3306
+#: addressbook/backend/ebook/e-card.c:3246
 msgid ""
 "\n"
 "  City:        "
@@ -99,13 +99,13 @@ msgstr ""
 "\n"
 "  Kaupunki:    "
 
-#: addressbook/backend/ebook/e-card.c:3307
+#: addressbook/backend/ebook/e-card.c:3247
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3308
+#: addressbook/backend/ebook/e-card.c:3248
 msgid ""
 "\n"
 "  Postal Code: "
@@ -113,7 +113,7 @@ msgstr ""
 "\n"
 "  Postinumero: "
 
-#: addressbook/backend/ebook/e-card.c:3309
+#: addressbook/backend/ebook/e-card.c:3249
 msgid ""
 "\n"
 "  Country:     "
@@ -121,25 +121,25 @@ msgstr ""
 "\n"
 "  Maa:         "
 
-#: addressbook/backend/ebook/e-card.c:3322
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3334
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3277
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3361
+#: addressbook/backend/ebook/e-card.c:3301
 msgid ""
 "\n"
 "E-mail:\n"
@@ -147,7 +147,7 @@ msgstr ""
 "\n"
 "S�hk�posti:\n"
 
-#: addressbook/backend/ebook/e-card.c:3364
+#: addressbook/backend/ebook/e-card.c:3304
 msgid ""
 "\n"
 "E-mail:"
@@ -155,13 +155,13 @@ msgstr ""
 "\n"
 "S�hk�posti:"
 
-#: addressbook/backend/ebook/e-card.c:3383
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3389
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "Time Zone: "
@@ -169,25 +169,25 @@ msgstr ""
 "\n"
 "Aikavy�hyke: "
 
-#: addressbook/backend/ebook/e-card.c:3397
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3401
+#: addressbook/backend/ebook/e-card.c:3341
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3413
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3414
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Name:  "
@@ -195,31 +195,31 @@ msgstr ""
 "\n"
 "  Nimi:  "
 
-#: addressbook/backend/ebook/e-card.c:3415
+#: addressbook/backend/ebook/e-card.c:3355
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3416
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3417
+#: addressbook/backend/ebook/e-card.c:3357
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3418
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3362
 msgid ""
 "\n"
 "Categories: "
@@ -227,7 +227,7 @@ msgstr ""
 "\n"
 "Ryhm�t: "
 
-#: addressbook/backend/ebook/e-card.c:3423
+#: addressbook/backend/ebook/e-card.c:3363
 msgid ""
 "\n"
 "Comment: "
@@ -243,13 +243,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3436
+#: addressbook/backend/ebook/e-card.c:3376
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3439
+#: addressbook/backend/ebook/e-card.c:3379
 msgid ""
 "\n"
 "Public Key: "
@@ -269,7 +269,7 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1089
+#: 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
@@ -285,20 +285,20 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:651
+#: addressbook/conduit/address-conduit.c:654
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:652
+#: addressbook/conduit/address-conduit.c:655
 #: calendar/conduits/calendar/calendar-conduit.c:732
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr ""
 
-#: 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 ""
 
@@ -402,7 +402,7 @@ msgstr "_Yritys:"
 
 #: 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
+#: ui/evolution-mail.xml.h:91 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Poista"
 
@@ -895,7 +895,7 @@ msgstr "Osoitekirjan l�hteet"
 #: 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:6 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Poista"
 
@@ -985,7 +985,7 @@ 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:547 filter/filter.glade.h:9
+#: 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"
@@ -1142,7 +1142,7 @@ msgstr "L�het� viesti kontaktille"
 #: 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:29
+#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:50
 #: ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Tulosta"
@@ -1521,20 +1521,20 @@ 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:627
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
 msgid "High"
 msgstr "Korkea"
 
 #: 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:626
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
 msgid "Normal"
 msgstr "Tavallinen"
 
 #: 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:625
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
 msgid "Low"
 msgstr "Matala"
 
@@ -1604,9 +1604,9 @@ 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:968
+#: 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:1124
+#: 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
 msgid "None"
@@ -2255,77 +2255,77 @@ 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:1290
+#: 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"
 
 #. 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-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:1317
+#: 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"
 
 #. 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:302
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
 #: calendar/gui/print.c:617
 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:305
+#: 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-day-view.c:3036 ui/evolution-calendar.xml.h:16
+#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 msgid "New Appointment"
 msgstr "Uusi tapaaminen"
 
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3242
+#: 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/e-day-view.c:3043 calendar/gui/e-week-view.c:3247
+#: 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/e-day-view.c:3045 calendar/gui/e-week-view.c:3249
+#: 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/e-day-view.c:3052 calendar/gui/e-week-view.c:3255
+#: 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 "Avaa"
 
-#: calendar/gui/e-day-view.c:3054 calendar/gui/e-week-view.c:3257
+#: 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/e-day-view.c:3056 calendar/gui/e-week-view.c:3259
+#: 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:3065 calendar/gui/e-week-view.c:3272
+#: 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:3067 calendar/gui/e-week-view.c:3274
+#: 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:3069
+#: calendar/gui/e-day-view.c:3179
 msgid "Delete all Occurrences"
 msgstr ""
 
@@ -2410,7 +2410,7 @@ msgstr ""
 msgid "Calendar Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:613
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
 msgid "Date:"
 msgstr "P�iv�ys:"
 
@@ -2508,8 +2508,8 @@ msgid ""
 "Time"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:30
-#: mail/message-list.c:1019
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
+#: mail/message-list.c:1052
 msgid "Status"
 msgstr "Tila"
 
@@ -2539,11 +2539,11 @@ msgstr ""
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3240 calendar/gui/e-week-view.c:3263
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
 msgid "New Appointment..."
 msgstr "Uusi tapaaminen..."
 
-#: calendar/gui/e-week-view.c:3276
+#: calendar/gui/e-week-view.c:3314
 msgid "Delete All Occurrences"
 msgstr ""
 
@@ -2635,11 +2635,11 @@ msgstr "_Alkamisaika:"
 msgid "_Starting date:"
 msgstr "_Alkamisp�iv�:"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
 msgid "after"
 msgstr "j�lkeen"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
 msgid "before"
 msgstr "ennen"
 
@@ -3069,7 +3069,7 @@ msgstr "Tulosta kalenteri"
 
 #: 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:30
+#: ui/evolution-mail.xml.h:52
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
@@ -3109,6 +3109,26 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMTKTPL"
 
+#: camel/camel-cipher-context.c:169
+msgid "Signing is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:207
+msgid "Clearsigning is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:245
+msgid "Verifying is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:286
+msgid "Encryption is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:326
+msgid "Decryption is not supported by this cipher"
+msgstr ""
+
 #: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
@@ -3162,7 +3182,7 @@ msgstr "Virhe j�sennett�ess� suodatinta: %s: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: camel/camel-filter-search.c:431 camel/camel-filter-search.c:437
+#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -3275,6 +3295,58 @@ msgstr "(tuntematon virhe)"
 msgid "Error copying mail temp file: %s"
 msgstr "Virhe kopioitaessa viestin v�liaikaistiedostoa: %s"
 
+#: camel/camel-pgp-context.c:186
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:189
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr ""
+
+#: camel/camel-pgp-context.c:509
+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
+msgid "No password provided."
+msgstr "Ei salasanaa."
+
+#: 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
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:681
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:871
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:888
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "V�liaikaistiedostoa ei voitu luoda: %s"
+
+#: camel/camel-pgp-context.c:1011
+#, fuzzy
+msgid "No plaintext to encrypt."
+msgstr "Napsauta kuvaketta salauksen purkamiseksi."
+
+#: camel/camel-pgp-context.c:1037
+msgid "No recipients specified"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1227
+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."
@@ -3292,37 +3364,37 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:189
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:193
+#: camel/camel-remote-store.c:190
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
+#: camel/camel-remote-store.c:240
 msgid "Connection cancelled"
 msgstr "Yhteys peruutettu"
 
-#: camel/camel-remote-store.c:246
+#: camel/camel-remote-store.c:243
 #: camel/providers/smtp/camel-smtp-transport.c:261
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:247
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:328 camel/camel-remote-store.c:390
-#: camel/camel-remote-store.c:461
+#: 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
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:467
+#: camel/camel-remote-store.c:464
 msgid "Server unexpectedly disconnected"
 msgstr ""
 
@@ -3490,12 +3562,12 @@ msgstr ""
 "%s"
 
 #. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:995 mail/mail-ops.c:1002
-#: mail/mail-ops.c:1020 mail/mail-ops.c:1021
+#: 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 "Roskakori"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL:n `%s' j�sent�minen ep�onnistui"
@@ -3565,7 +3637,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:479
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
 msgid "Folders"
 msgstr "Kansiot"
 
@@ -3619,7 +3691,6 @@ msgid "You didn't enter a password."
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:518
-#: camel/providers/smtp/camel-smtp-transport.c:411
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3627,17 +3698,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:858
+#: camel/providers/imap/camel-imap-store.c:865
 #, c-format
 msgid "%s is not a selectable folder"
 msgstr "%s ei ole valittavissa oleva kansio"
 
-#: camel/providers/imap/camel-imap-store.c:872
+#: camel/providers/imap/camel-imap-store.c:879
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1373
+#: camel/providers/imap/camel-imap-store.c:1382
 msgid "You must be working online to complete this operation"
 msgstr ""
 
@@ -3864,7 +3935,7 @@ 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:1383
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
 msgid "Synchronising folder"
 msgstr "Synkronoidaan kansiota"
 
@@ -4280,6 +4351,14 @@ msgstr ""
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
+#: camel/providers/smtp/camel-smtp-transport.c:411
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+
 #: camel/providers/smtp/camel-smtp-transport.c:527
 #, c-format
 msgid "SMTP server %s"
@@ -4433,7 +4512,7 @@ msgstr "Lis�� liite..."
 msgid "Attach a file to the message"
 msgstr "Lis�� viestiin liitetiedoston"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1019
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
 msgid "Attachment"
 msgstr "Liite"
 
@@ -4464,25 +4543,25 @@ msgstr ""
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:709
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
 msgid "From:"
 msgstr "L�hett�j�:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:711
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
 msgid "Reply-To:"
 msgstr "Vastausosoite:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:633
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:713
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
 msgid "To:"
 msgstr "Vastaanottaja:"
 
@@ -4490,7 +4569,7 @@ msgstr "Vastaanottaja:"
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:715
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
 msgid "Cc:"
 msgstr ""
 
@@ -4966,7 +5045,7 @@ msgid ""
 msgstr ""
 
 #: filter/filter-folder.c:222 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:678
+#: mail/mail-account-gui.c:682
 msgid "Select Folder"
 msgstr ""
 
@@ -4989,31 +5068,31 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:624
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "S��nn�n nimi: "
 
-#: filter/filter-rule.c:628
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "Nimet�n"
 
-#: filter/filter-rule.c:644
+#: filter/filter-rule.c:646
 msgid "If"
 msgstr "Jos"
 
-#: filter/filter-rule.c:662
+#: filter/filter-rule.c:664
 msgid "Execute actions"
 msgstr "Suorita toiminnot"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:668
 msgid "if all criteria are met"
 msgstr "kaikki ehdot t�ytet��n"
 
-#: filter/filter-rule.c:671
+#: filter/filter-rule.c:673
 msgid "if any criteria are met"
 msgstr "mik��n ehdoista t�yttyy"
 
-#: filter/filter-rule.c:682
+#: filter/filter-rule.c:684
 msgid "Add criterion"
 msgstr "Lis�� ehto"
 
@@ -5111,139 +5190,154 @@ msgid "Important"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "Is Not"
+msgstr "ei ole"
+
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Is"
+msgstr "I"
+
+#: filter/libfilter-i18n.h:18
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:20
 msgid "Message Header"
 msgstr "Viestin otsikko"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:21
 msgid "Message was received"
 msgstr "Viesti vastaanotettu"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:22
 msgid "Message was sent"
 msgstr "Viesti l�hetetty"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:23
 msgid "Move to Folder"
 msgstr "Siirr� kansioon"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:24
 msgid "Read"
 msgstr "Lue"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:25
 msgid "Recipients"
 msgstr "Vastaanottajat"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:26
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:27
 msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 filter/score-rule.c:203 filter/score-rule.c:205
-#: mail/message-list.c:1019
+#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
+#: mail/message-list.c:1052
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:29
 msgid "Sender"
 msgstr "L�hett�j�"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:30
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "Source Account"
+msgstr "Tili"
+
+#: filter/libfilter-i18n.h:32
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:34
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32 mail/message-list.c:1020
+#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
 msgid "Subject"
 msgstr "Aihe"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:38
 msgid "contains"
 msgstr "sis�lt��"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:39
 msgid "does not contain"
 msgstr "ei sis�ll�"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:40
 msgid "does not end with"
 msgstr "ei lopu merkkijonoon"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
 msgid "does not exist"
 msgstr "ei ole olemassa"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 msgid "does not start with"
 msgstr "ei ala merkkijonolla"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:44
 msgid "ends with"
 msgstr "loppuu merkkijonoon"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:45
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 msgid "is greater than"
 msgstr "on suurempi kuin"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 msgid "is less than"
 msgstr "on pienempi kuin"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "is not"
 msgstr "ei ole"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 msgid "is"
 msgstr "on"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "on or after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "alkaa merkkijonolla"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:54
 msgid "was after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:55
 msgid "was before"
 msgstr ""
 
@@ -5251,11 +5345,11 @@ msgstr ""
 msgid "Score Rules"
 msgstr ""
 
-#: mail/component-factory.c:332
+#: mail/component-factory.c:329
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:405
+#: mail/component-factory.c:402
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -5317,15 +5411,15 @@ msgstr "Tallenna nimell�..."
 msgid "Reply to Sender"
 msgstr "Vastaa l�hett�j�lle"
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:36
+#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:14
+#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
 msgid "Forward"
 msgstr "V�lit�"
 
-#: mail/folder-browser.c:583
+#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
 msgid "Forward inline"
 msgstr ""
 
@@ -5345,7 +5439,7 @@ msgstr "Siirr� kansioon..."
 msgid "Copy to Folder..."
 msgstr "Kopioi kansioon..."
 
-#: mail/folder-browser.c:599
+#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
 msgid "Undelete"
 msgstr "Palauta"
 
@@ -5353,7 +5447,7 @@ msgstr "Palauta"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:609
+#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
 msgid "Apply Filters"
 msgstr ""
 
@@ -5592,7 +5686,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1302
+#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
@@ -5889,72 +5983,72 @@ msgstr ""
 msgid "Hide"
 msgstr "Piilota"
 
-#: mail/mail-display.c:1100
+#: mail/mail-display.c:1102
 msgid "Open link in browser"
 msgstr "Avaa linkki selaimessa"
 
-#: mail/mail-display.c:1102
+#: mail/mail-display.c:1104
 msgid "Save as (FIXME)"
 msgstr "Tallenna nimell�"
 
-#: mail/mail-display.c:1104
+#: mail/mail-display.c:1106
 msgid "Copy location (FIXME)"
 msgstr "Kopioi sijainti"
 
-#: mail/mail-format.c:512
+#: mail/mail-format.c:518
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:554
+#: mail/mail-format.c:560
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:736
+#: mail/mail-format.c:742
 msgid "Loading message content"
 msgstr "Ladataan viestin sis�lt��"
 
-#: mail/mail-format.c:1025
+#: mail/mail-format.c:1046
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1031
+#: mail/mail-format.c:1052
 msgid "Encrypted message"
 msgstr "Salattu viesti"
 
-#: mail/mail-format.c:1032
+#: mail/mail-format.c:1053
 msgid "Click icon to decrypt."
 msgstr "Napsauta kuvaketta salauksen purkamiseksi."
 
-#: mail/mail-format.c:1101 mail/mail-format.c:1488
+#: mail/mail-format.c:1137 mail/mail-format.c:1526
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1109 mail/mail-format.c:1496
+#: mail/mail-format.c:1145 mail/mail-format.c:1534
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1709
+#: mail/mail-format.c:1747
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1721
+#: mail/mail-format.c:1759
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1725
+#: mail/mail-format.c:1763
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1759
+#: mail/mail-format.c:1797
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1764
+#: mail/mail-format.c:1802
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -6038,123 +6132,123 @@ msgstr "Hyv�ksytk�?"
 msgid "Evolution progress"
 msgstr ""
 
-#: mail/mail-ops.c:588
+#: mail/mail-ops.c:587
 #, c-format
 msgid "Sending \"%s\""
 msgstr "L�hetet��n \"%s\""
 
-#: mail/mail-ops.c:590
+#: mail/mail-ops.c:589
 msgid "Sending message"
 msgstr "L�hetet��n viesti�"
 
-#: mail/mail-ops.c:705
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "L�hetet��n viesti� %d / %d"
 
-#: mail/mail-ops.c:724
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:726 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:812
+#: mail/mail-ops.c:811
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:885
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:885
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:900
 msgid "Moving"
 msgstr "Siirret��n"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:903
 msgid "Copying"
 msgstr "Kopioidaan"
 
-#: mail/mail-ops.c:979
+#: mail/mail-ops.c:978
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1140
+#: mail/mail-ops.c:1139
 msgid "Forwarded messages"
 msgstr "V�litetyt viestit"
 
-#: mail/mail-ops.c:1181 mail/mail-ops.c:1319
+#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1247
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1435
+#: mail/mail-ops.c:1434
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1484
+#: mail/mail-ops.c:1483
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viesti� %s"
 
-#: mail/mail-ops.c:1551
+#: mail/mail-ops.c:1550
 msgid "Retrieving messages"
 msgstr "Haetaan viestej�"
 
-#: mail/mail-ops.c:1561
+#: mail/mail-ops.c:1560
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1635
+#: mail/mail-ops.c:1634
 msgid "Saving messages"
 msgstr "Tallennetaan viestej�"
 
-#: mail/mail-ops.c:1714
+#: mail/mail-ops.c:1713
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1727
+#: mail/mail-ops.c:1726
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1741
+#: mail/mail-ops.c:1740
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1815
+#: mail/mail-ops.c:1814
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:1830
+#: mail/mail-ops.c:1829
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1858
+#: mail/mail-ops.c:1857
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
@@ -6235,149 +6329,114 @@ 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:35
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
 msgid "Reply"
 msgstr "Vastaa"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:39
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
 msgid "Reply to the sender of this message"
 msgstr "Vastaa t�m�n viestin l�hett�j�lle"
 
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
 msgid "Reply to all recipients of this message"
 msgstr "Vastaa kaikille t�m�n viestin vastaanottajille"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:16
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
 msgid "Forward this message"
 msgstr "V�lit� t�m� viesti"
 
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:32
+#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
 msgid "Print the selected message"
 msgstr "Tulosta valittu viesti"
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:7
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Poista t�m� viesti"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:648
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:616
+#: mail/message-list.c:649
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:617
+#: mail/message-list.c:650
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:618
+#: mail/message-list.c:651
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:619
+#: mail/message-list.c:652
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:623
+#: mail/message-list.c:656
 msgid "Lowest"
 msgstr "Matalin"
 
-#: mail/message-list.c:624
+#: mail/message-list.c:657
 msgid "Lower"
 msgstr "Matalampi"
 
-#: mail/message-list.c:628
+#: mail/message-list.c:661
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: mail/message-list.c:629
+#: mail/message-list.c:662
 msgid "Highest"
 msgstr "Korkein"
 
-#: mail/message-list.c:879
+#: mail/message-list.c:912
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:886
+#: mail/message-list.c:919
 msgid "Today %l:%M %p"
 msgstr "T�n��n %l:%M %p"
 
-#: mail/message-list.c:895
+#: mail/message-list.c:928
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: mail/message-list.c:907
+#: mail/message-list.c:940
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:948
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:917
+#: mail/message-list.c:950
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1052
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1020
+#: mail/message-list.c:1053
 msgid "From"
 msgstr "L�hett�j�"
 
-#: mail/message-list.c:1020
+#: mail/message-list.c:1053
 msgid "Date"
 msgstr "P�iv�ys"
 
-#: mail/message-list.c:1020
+#: mail/message-list.c:1053
 msgid "Received"
 msgstr "Otettu vastaan"
 
-#: mail/message-list.c:1021
+#: mail/message-list.c:1054
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: mail/message-list.c:1021
+#: mail/message-list.c:1054
 msgid "Size"
 msgstr "Koko"
 
-#: mail/openpgp-utils.c:92
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:95
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr ""
-
-#: mail/openpgp-utils.c:455 mail/openpgp-utils.c:562 mail/openpgp-utils.c:766
-#: mail/openpgp-utils.c:920 mail/openpgp-utils.c:1079
-msgid "No GPG/PGP program available."
-msgstr "GPG/PGP-ohjelmaa ei ole."
-
-#: mail/openpgp-utils.c:462 mail/openpgp-utils.c:571 mail/openpgp-utils.c:773
-#: mail/openpgp-utils.c:927
-msgid "No password provided."
-msgstr "Ei salasanaa."
-
-#: mail/openpgp-utils.c:470 mail/openpgp-utils.c:578 mail/openpgp-utils.c:779
-#: mail/openpgp-utils.c:935 mail/openpgp-utils.c:1085
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:592
-msgid "No recipients specified"
-msgstr ""
-
-#: mail/openpgp-utils.c:1096
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "V�liaikaistiedostoa ei voitu luoda: %s"
-
 #: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
 msgid "Folder"
 msgstr "Kansio"
@@ -6643,12 +6702,12 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1129
+#: shell/e-shell-view.c:1134
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1131
+#: shell/e-shell-view.c:1136
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
@@ -6867,7 +6926,7 @@ msgstr "Etsi kontakti"
 msgid "New contact"
 msgstr "Uusi kontakti"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:28
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
 msgid "Previews the message to be printed"
 msgstr "Esikatsele tulostettavaa viesti�"
 
@@ -6875,7 +6934,7 @@ msgstr "Esikatsele tulostettavaa viesti�"
 msgid "Print contacts"
 msgstr "Tulosta kontaktit"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:48
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
 msgid "Stop"
 msgstr "Pys�yt�"
 
@@ -6909,7 +6968,7 @@ 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:78
+#: 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"
 msgstr "T_y�kalut"
@@ -7057,7 +7116,7 @@ msgstr "_Uusi"
 msgid "_Open Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:75
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
 #: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "Tallenna _nimell�..."
@@ -7088,7 +7147,7 @@ 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:33 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Tulosta..."
 
@@ -7175,7 +7234,7 @@ msgstr "Sulje t�m� tapaaminen"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "Kopioi kansioon..."
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
+#: 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"
@@ -7286,7 +7345,8 @@ msgstr ""
 msgid "Schedule some sort of a meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+#: 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 "Valitse kaikki"
 
@@ -7364,7 +7424,7 @@ msgstr "L_iit�"
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:71
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Ominaisuudet..."
@@ -7402,123 +7462,244 @@ msgstr ""
 msgid "New Mail"
 msgstr "Uusi s�hk�posti"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-mail.xml.h:2
+msgid "Apply any new filters to the mail in this box"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:3
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:4
 msgid "Compose"
 msgstr "Kirjoita"
 
-#: ui/evolution-mail.xml.h:2
+#: ui/evolution-mail.xml.h:5
 msgid "Compose a new message"
 msgstr "Kirjoita uusi viesti"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Configure Folder..."
+msgstr "Siirr� kansioon..."
+
+#: ui/evolution-mail.xml.h:8
 msgid "Copy message to a new folder"
 msgstr "Kopioi viesti uuteen kansioon"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail.xml.h:9
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Kopioi viesti uuteen kansioon"
+
+#: ui/evolution-mail.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:8
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Delete the selected messages"
+msgstr "Tulosta valittu viesti"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Display all of the message headers"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:15
+#, fuzzy
+msgid "Edit Message"
+msgstr "Tulosta viesti"
+
+#: ui/evolution-mail.xml.h:16
+#, fuzzy
+msgid "Edit the current message"
+msgstr "Tulosta valittu viesti"
+
+#: ui/evolution-mail.xml.h:17
 msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail.xml.h:18
+msgid "Expunge"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:19
 msgid "Filter on Se_nder"
 msgstr "Suodata _l�hett�j�n mukaan"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:20
 msgid "Filter on _Recipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:21
 msgid "Filter on _Subject"
 msgstr "Suodata _aiheen mukaan"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:22
+msgid "Finaly remove all mails tagged for deletion"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:23
 msgid "Forget _Passwords"
 msgstr "_Unohda salasanat"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:25
 msgid "Forward As"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail.xml.h:27
+msgid "Forward the selected mail to someone"
+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.xml.h:30
 msgid "Full _Headers"
 msgstr "T�ydet _otsikkotiedot"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:31
 msgid "Hide Deleted Messages"
 msgstr "Piilota poistetut viestit"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:32
 msgid "Hide S_elected Messages"
 msgstr "Piilota valitut vi_estit"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:33
 msgid "Hide _Deleted Messages"
 msgstr "Piilota _poistetut viestit"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:34
 msgid "Hide _Read messages"
 msgstr "Piilota _luetut viestit"
 
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:35
+#, fuzzy
+msgid "Invert Selection"
+msgstr "_K��nn� valinta"
+
+#: ui/evolution-mail.xml.h:36
 msgid "Manage _Subscriptions..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:37
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:38
 msgid "Mark All as R_ead"
 msgstr "Merkitse ka_ikki luetuksi"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:39
+#, fuzzy
+msgid "Mark As Read"
+msgstr "Merkitse luetuksi"
+
+#: ui/evolution-mail.xml.h:40
+#, fuzzy
+msgid "Mark As U_nread"
+msgstr "Merkitse luke_mattomaksi"
+
+#: ui/evolution-mail.xml.h:41
 msgid "Mark as U_nread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:42
+#, fuzzy
+msgid "Mark the selected messages as having been read"
+msgstr "Tulosta valittu viesti"
+
+#: ui/evolution-mail.xml.h:43
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:44
 msgid "Move"
 msgstr "Siirr�"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:45
 msgid "Move message to a new folder"
 msgstr "Siirr� viesti uuteen kansioon"
 
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:46
+#, fuzzy
+msgid "Move selected messages to another folder"
+msgstr "Siirr� viesti uuteen kansioon"
+
+#: ui/evolution-mail.xml.h:47
+#, fuzzy
+msgid "Open in New Window"
+msgstr "Avaa linkki selaimessa"
+
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Open the current message in a new window"
+msgstr "L�het� viesti heti"
+
+#: ui/evolution-mail.xml.h:53
+#, fuzzy
+msgid "Print Preview of message..."
+msgstr "Tulostuksen esikatselu"
+
+#: ui/evolution-mail.xml.h:54
 msgid "Print message to the printer"
 msgstr "Tulosta viesti tulostimella"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:55
+#, fuzzy
+msgid "Print message..."
+msgstr "Tulosta viesti"
+
+#: ui/evolution-mail.xml.h:58
 msgid "Redirect (FIXME: implement me)"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:61
 msgid "Reply to _All"
 msgstr "Vastaa _kaikille"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:62
+#, fuzzy
+msgid "Reply to all"
+msgstr "Vastaa kaikille"
+
+#: ui/evolution-mail.xml.h:64
+#, fuzzy
+msgid "Reply to sender"
+msgstr "Vastaa l�hett�j�lle"
+
+#: ui/evolution-mail.xml.h:66
 msgid "S_ource"
 msgstr "_L�hde"
 
-#: ui/evolution-mail.xml.h:41 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "Save the message into a new file"
+msgstr "Tallenna viesti johonkin tiettyyn kansioon"
+
+#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:70
 msgid "Select _Thread"
 msgstr "Valitse _s�ie"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:71
 msgid "Send / Receive"
 msgstr "L�het� / Vastaanota"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:72
+msgid "Send a reply to the person who sent you this mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:73
+msgid "Send a single mail in reply to all the selected mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:74
 msgid ""
 "Send queued mail\n"
 "    and retrieve new mail"
@@ -7526,119 +7707,125 @@ msgstr ""
 "l�het� jonossa olevat viestit\n"
 "    ja hae uudet viestit"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:76
 msgid "Send queued mail and retrieve new mail"
 msgstr "L�het� jonossa olevat viestit ja hae uudet viestit"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:77
 msgid "Show _All"
 msgstr "N�yt� k_aikki"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:79
 msgid "Threaded Message list"
 msgstr "S�ikeistetty viesti-ikkuna"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:80
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "Tulosta valittu viesti"
+
+#: ui/evolution-mail.xml.h:82
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:83
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:84
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:85
 msgid "View Raw Message Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:86
 msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:87
 msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:88
 msgid "_Attachment"
 msgstr "_Liite"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Compose"
-msgstr "_Kirjoita"
-
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:89
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:90
 msgid "_Create Filter From Message"
 msgstr "_Luo viestist� suodatin"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:92
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:93
 msgid "_Filters..."
 msgstr "S_uodattimet..."
 
-#: ui/evolution-mail.xml.h:63 ui/evolution.xml.h:31
+#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
 msgid "_Folder"
 msgstr "_Kansio"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:95
 msgid "_Forward"
 msgstr "_V�lit�"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:96
 msgid "_Inline"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_K��nn� valinta"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:98
 msgid "_Mail Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:99
 msgid "_Mail Settings..."
 msgstr "_S�hk�postiasetukset..."
 
-#: ui/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:100
 msgid "_Move to Folder..."
 msgstr "_Siirr� kansioon..."
 
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail.xml.h:101
 msgid "_Open Selected Items"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail.xml.h:103
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail.xml.h:104
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail.xml.h:105
 msgid "_Resend Messages"
 msgstr "L�het� viestej� _uudelleen"
 
-#: ui/evolution-mail.xml.h:76
+#: ui/evolution-mail.xml.h:107
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Tallenna viesti nimell�..."
+
+#: ui/evolution-mail.xml.h:108
 msgid "_Send / Receive"
 msgstr "_L�het� / Vastaanota"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:109
 msgid "_Threaded"
 msgstr "_S�ikeistys"
 
-#: ui/evolution-mail.xml.h:79
+#: ui/evolution-mail.xml.h:111
 msgid "_Undelete"
 msgstr "_Palauta"
 
@@ -8122,11 +8309,11 @@ msgstr ""
 msgid "All Attendees"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:178
+#: widgets/menus/gal-view-menus.c:177
 msgid "_Current View"
 msgstr "_Nykyinen n�kym�"
 
-#: widgets/menus/gal-view-menus.c:198
+#: widgets/menus/gal-view-menus.c:196
 msgid "Define Views"
 msgstr ""
 
@@ -8247,3 +8434,8 @@ msgstr "init_corba(): GNOME:n alustus ep�onnistui"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 
+#~ msgid "No GPG/PGP program available."
+#~ msgstr "GPG/PGP-ohjelmaa ei ole."
+
+#~ msgid "_Compose"
+#~ msgstr "_Kirjoita"
diff --git a/po/fr.po b/po/fr.po
index 56621ffe9a..2b910af395 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-03-15 11:10+0100\n"
+"POT-Creation-Date: 2001-04-14 08:51-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,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3209
 msgid "Card: "
 msgstr "Carte : "
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3211
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +26,7 @@ msgstr ""
 "\n"
 "Nom : "
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3212
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +34,7 @@ msgstr ""
 "\n"
 "  Pr�fixe :     "
 
-#: addressbook/backend/ebook/e-card.c:3057
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +42,7 @@ msgstr ""
 "\n"
 "  Donn� :      "
 
-#: addressbook/backend/ebook/e-card.c:3058
+#: addressbook/backend/ebook/e-card.c:3214
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +50,7 @@ msgstr ""
 "\n"
 "  Additionnel : "
 
-#: addressbook/backend/ebook/e-card.c:3059
+#: addressbook/backend/ebook/e-card.c:3215
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +58,7 @@ msgstr ""
 "\n"
 "  Famille :     "
 
-#: addressbook/backend/ebook/e-card.c:3060
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +66,7 @@ msgstr ""
 "\n"
 "  Suffixe :     "
 
-#: addressbook/backend/ebook/e-card.c:3074
+#: addressbook/backend/ebook/e-card.c:3230
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +74,7 @@ msgstr ""
 "\n"
 "Date de naissance : "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3241
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +82,7 @@ msgstr ""
 "\n"
 "Addresse :"
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3243
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,7 +90,7 @@ msgstr ""
 "\n"
 "  Boite postale :  "
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3244
 msgid ""
 "\n"
 "  Ext:         "
@@ -98,7 +98,7 @@ msgstr ""
 "\n"
 "  Ext :         "
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3245
 msgid ""
 "\n"
 "  Street:      "
@@ -106,7 +106,7 @@ msgstr ""
 "\n"
 "  Rue :      "
 
-#: addressbook/backend/ebook/e-card.c:3090
+#: addressbook/backend/ebook/e-card.c:3246
 msgid ""
 "\n"
 "  City:        "
@@ -114,7 +114,7 @@ msgstr ""
 "\n"
 "  Ville :        "
 
-#: addressbook/backend/ebook/e-card.c:3091
+#: addressbook/backend/ebook/e-card.c:3247
 msgid ""
 "\n"
 "  Region:      "
@@ -122,7 +122,7 @@ msgstr ""
 "\n"
 "  R�gion :      "
 
-#: addressbook/backend/ebook/e-card.c:3092
+#: addressbook/backend/ebook/e-card.c:3248
 msgid ""
 "\n"
 "  Postal Code: "
@@ -130,7 +130,7 @@ msgstr ""
 "\n"
 "  Code postal : "
 
-#: addressbook/backend/ebook/e-card.c:3093
+#: addressbook/backend/ebook/e-card.c:3249
 msgid ""
 "\n"
 "  Country:     "
@@ -138,7 +138,7 @@ msgstr ""
 "\n"
 "  Pays :     "
 
-#: addressbook/backend/ebook/e-card.c:3106
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "Delivery Label: "
@@ -146,7 +146,7 @@ msgstr ""
 "\n"
 "D�nomination : "
 
-#: addressbook/backend/ebook/e-card.c:3118
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "Telephones:\n"
@@ -154,7 +154,7 @@ msgstr ""
 "\n"
 "T�l�phones :\n"
 
-#: addressbook/backend/ebook/e-card.c:3121
+#: addressbook/backend/ebook/e-card.c:3277
 msgid ""
 "\n"
 "Telephone:"
@@ -162,7 +162,7 @@ msgstr ""
 "\n"
 "T�l�phone :"
 
-#: addressbook/backend/ebook/e-card.c:3145
+#: addressbook/backend/ebook/e-card.c:3301
 msgid ""
 "\n"
 "E-mail:\n"
@@ -170,7 +170,7 @@ msgstr ""
 "\n"
 "Adresse �lectronique :\n"
 
-#: addressbook/backend/ebook/e-card.c:3148
+#: addressbook/backend/ebook/e-card.c:3304
 msgid ""
 "\n"
 "E-mail:"
@@ -178,7 +178,7 @@ msgstr ""
 "\n"
 "Adresse �lectronique 2 :"
 
-#: addressbook/backend/ebook/e-card.c:3167
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Mailer: "
@@ -186,7 +186,7 @@ msgstr ""
 "\n"
 "Messager : "
 
-#: addressbook/backend/ebook/e-card.c:3173
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "Time Zone: "
@@ -194,7 +194,7 @@ msgstr ""
 "\n"
 "Fuseau horaire : "
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Geo Location: "
@@ -202,7 +202,7 @@ msgstr ""
 "\n"
 "Situation g�ographique : "
 
-#: addressbook/backend/ebook/e-card.c:3185
+#: addressbook/backend/ebook/e-card.c:3341
 msgid ""
 "\n"
 "Business Role: "
@@ -210,7 +210,7 @@ msgstr ""
 "\n"
 "Profession : "
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "Org: "
@@ -218,7 +218,7 @@ msgstr ""
 "\n"
 "Org : "
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Name:  "
@@ -226,7 +226,7 @@ msgstr ""
 "\n"
 "  Nom :  "
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3355
 msgid ""
 "\n"
 "  Unit:  "
@@ -234,7 +234,7 @@ msgstr ""
 "\n"
 "  Unit� :  "
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "  Unit2: "
@@ -242,7 +242,7 @@ msgstr ""
 "\n"
 "  Unit� 2 : "
 
-#: addressbook/backend/ebook/e-card.c:3201
+#: addressbook/backend/ebook/e-card.c:3357
 msgid ""
 "\n"
 "  Unit3: "
@@ -250,7 +250,7 @@ msgstr ""
 "\n"
 "  Unit� 3 : "
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Unit4: "
@@ -258,7 +258,7 @@ msgstr ""
 "\n"
 "  Unit� 4 : "
 
-#: addressbook/backend/ebook/e-card.c:3206
+#: addressbook/backend/ebook/e-card.c:3362
 msgid ""
 "\n"
 "Categories: "
@@ -266,7 +266,7 @@ msgstr ""
 "\n"
 "Cat�gories : "
 
-#: addressbook/backend/ebook/e-card.c:3207
+#: addressbook/backend/ebook/e-card.c:3363
 msgid ""
 "\n"
 "Comment: "
@@ -284,7 +284,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3220
+#: addressbook/backend/ebook/e-card.c:3376
 msgid ""
 "\n"
 "Unique String: "
@@ -292,7 +292,7 @@ msgstr ""
 "\n"
 "Cha�ne unique : "
 
-#: addressbook/backend/ebook/e-card.c:3223
+#: addressbook/backend/ebook/e-card.c:3379
 msgid ""
 "\n"
 "Public Key: "
@@ -308,15 +308,15 @@ msgstr ""
 msgid "Imports GnomeCard files into Evolution."
 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
+#: 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:68 calendar/gui/main.c:54
+#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
 msgid "Could not initialize Bonobo"
 msgstr "Ne peut initialiser Bonobo"
 
@@ -328,20 +328,20 @@ msgstr "Le curseur ne peut �tre charg�\n"
 msgid "EBook not loaded\n"
 msgstr "EBook non charg�\n"
 
-#: addressbook/conduit/address-conduit.c:651
+#: addressbook/conduit/address-conduit.c:654
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Ne peut d�marrer le serveur wombat"
 
-#: addressbook/conduit/address-conduit.c:652
+#: addressbook/conduit/address-conduit.c:655
 #: calendar/conduits/calendar/calendar-conduit.c:732
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Ne peut d�marrer 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 "Ne peut lire le bloc d'application Adresse du Pilot"
 
@@ -349,7 +349,7 @@ msgstr "Ne peut lire le bloc d'application Adresse du Pilot"
 #: 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:4
+#: mail/mail-config.glade.h:7
 msgid "Add"
 msgstr "Ajouter"
 
@@ -390,7 +390,6 @@ msgstr "Classer comme :"
 
 #: addressbook/contact-editor/contact-editor.glade.h:10
 #: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:27
 msgid "General"
 msgstr "G�n�ral"
 
@@ -407,7 +406,7 @@ msgid "Phone Types"
 msgstr "Types de t�l�phones"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "Primary Email"
 msgstr "E-mail principal"
 
@@ -420,7 +419,7 @@ msgid "Web page address:"
 msgstr "Page Web :"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:74
 msgid "_Add"
 msgstr "_Ajouter"
 
@@ -445,8 +444,8 @@ msgid "_Company:"
 msgstr "So_ci�t� :"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
+#: 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"
 msgstr "_Supprimer"
 
@@ -498,129 +497,125 @@ msgstr "_C'est l'adresse de la liste de diffusion"
 msgid "Delete Contact?"
 msgstr "Supprimer le contact ?"
 
-#: addressbook/contact-editor/e-contact-editor.c:590
+#: addressbook/contact-editor/e-contact-editor.c:603
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "�lement(s) appartenant � ces cat�gories : "
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/widgets/e-addressbook-view.c:676
 msgid "Assistant"
 msgstr "Assistant"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1297
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1310
 msgid "Business"
 msgstr "Travail"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/contact-editor/e-contact-editor.c:1244
 msgid "Business 2"
 msgstr "Travail 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Business Fax"
 msgstr "Fax travail"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Callback"
 msgstr "R�pondeur"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "Car"
 msgstr "Voiture"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1248
 msgid "Company"
 msgstr "Soci�t�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
-#: addressbook/contact-editor/e-contact-editor.c:1298
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1311
 msgid "Home"
 msgstr "Maison"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/contact-editor/e-contact-editor.c:1250
 msgid "Home 2"
 msgstr "Maison 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Home Fax"
 msgstr "Fax maison"
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "ISDN"
 msgstr "RNIS"
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/contact-editor/e-contact-editor.c:1253
 msgid "Mobile"
 msgstr "Mobile"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/contact-editor/e-contact-editor.c:1299
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
+#: 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"
 msgstr "Autre"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:662
 msgid "Other Fax"
 msgstr "Fax autre"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1257
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/gui/widgets/e-addressbook-view.c:664
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/widgets/e-addressbook-view.c:665
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:1260
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
-#: addressbook/gui/widgets/e-addressbook-view.c:593
+#: 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:1273
-#: addressbook/gui/widgets/e-addressbook-view.c:594
+#: 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:214
+#: addressbook/contact-editor/e-contact-quick-add.c:223
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:216
+#: addressbook/contact-editor/e-contact-quick-add.c:225
 #, fuzzy
 msgid "Edit Full"
 msgstr "�diter les Filtres"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:253
+#: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/widgets/e-addressbook-view.c:643
 #, fuzzy
 msgid "Full Name"
 msgstr "Nom complet :"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:259
+#: addressbook/contact-editor/e-contact-quick-add.c:268
 #, fuzzy
 msgid "E-mail"
 msgstr "Adresse �lec."
@@ -739,25 +734,25 @@ msgstr "_Suffixe :"
 msgid "_Title:"
 msgstr "_Titre :"
 
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:241
 msgid "As _Minicards"
 msgstr "Comme _minicartes"
 
-#: addressbook/gui/component/addressbook.c:243
+#: addressbook/gui/component/addressbook.c:247
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Comme _tableau"
 
-#: addressbook/gui/component/addressbook.c:412
+#: 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:440
+#: addressbook/gui/component/addressbook.c:427
 msgid "Unable to open addressbook"
 msgstr "Impossible d'ouvrir le carnet d'adresses"
 
-#: addressbook/gui/component/addressbook.c:445
+#: 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"
@@ -777,149 +772,149 @@ msgstr ""
 "vous devriez t�l�charger et installer OpenLDAP, puis\n"
 "recompiler et installer Evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:568
+#: addressbook/gui/component/addressbook.c:555
 msgid "Show All"
 msgstr "Afficher tout"
 
-#: addressbook/gui/component/addressbook.c:570
+#: addressbook/gui/component/addressbook.c:557
 msgid "Advanced..."
 msgstr "Avanc�e..."
 
-#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:587
 msgid "Any field contains"
 msgstr "N'importe quel champ contient"
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:588
 msgid "Name contains"
 msgstr "Le nom contient"
 
-#: addressbook/gui/component/addressbook.c:602
+#: addressbook/gui/component/addressbook.c:589
 msgid "Email contains"
 msgstr "L'e-mail contient"
 
-#: addressbook/gui/component/addressbook.c:745
+#: 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:95
+#: addressbook/gui/component/addressbook-storage.c:99
 msgid "Other Contacts"
 msgstr "Autres contacts"
 
-#: addressbook/gui/component/addressbook-config.c:143
+#: addressbook/gui/component/addressbook-config.c:148
 msgid "LDAP Server"
 msgstr "Serveur LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:145
+#: addressbook/gui/component/addressbook-config.c:150
 msgid "File"
 msgstr "Fichier"
 
-#: addressbook/gui/component/addressbook-config.c:148
+#: addressbook/gui/component/addressbook-config.c:153
 msgid "Unknown addressbook type"
 msgstr "Type de carnet d'adresses inconnu"
 
-#: addressbook/gui/component/addressbook-config.c:158
+#: addressbook/gui/component/addressbook-config.c:163
 msgid "None (anonymous mode)"
 msgstr "Aucun (mode anonyme)"
 
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:261
+#: 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-store.c:145
+#: 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:162
+#: addressbook/gui/component/addressbook-config.c:167
 msgid "SASL"
 msgstr "SASL"
 
-#: addressbook/gui/component/addressbook-config.c:165
+#: addressbook/gui/component/addressbook-config.c:170
 msgid "Unknown auth type"
 msgstr "Type d'identification inconnu"
 
-#: addressbook/gui/component/addressbook-config.c:174
+#: addressbook/gui/component/addressbook-config.c:179
 msgid "Base"
 msgstr "Base"
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "One"
 msgstr "Un"
 
-#: addressbook/gui/component/addressbook-config.c:178
+#: addressbook/gui/component/addressbook-config.c:183
 msgid "Subtree"
 msgstr "Sous-arborescence"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-config.c:186
 msgid "Unknown scope type"
 msgstr "Type de domaine inconnu"
 
-#: addressbook/gui/component/addressbook-config.c:348
+#: addressbook/gui/component/addressbook-config.c:353
 msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:349
+#: addressbook/gui/component/addressbook-config.c:354
 msgid "FIXME Bind DN Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:351
+#: 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:401
+#: addressbook/gui/component/addressbook-config.c:406
 #: mail/mail-config.glade.h:28
 msgid "Host:"
 msgstr "H�te :"
 
-#: addressbook/gui/component/addressbook-config.c:402
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "FIXME Host help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:404
+#: addressbook/gui/component/addressbook-config.c:409
 msgid "Port:"
 msgstr "Port :"
 
-#: addressbook/gui/component/addressbook-config.c:405
+#: addressbook/gui/component/addressbook-config.c:410
 msgid "FIXME Port help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/component/addressbook-config.c:414
 msgid "Root DN:"
 msgstr "Racine DN :"
 
-#: addressbook/gui/component/addressbook-config.c:410
+#: addressbook/gui/component/addressbook-config.c:415
 msgid "FIXME Root DN help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:430
+#: addressbook/gui/component/addressbook-config.c:435
 msgid "Search Scope:"
 msgstr "Domaine de recherche :"
 
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:8
+#: addressbook/gui/component/addressbook-config.c:489
 msgid "Authentication:"
 msgstr "Identification :"
 
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
+#: addressbook/gui/component/addressbook-config.c:507
+#: mail/mail-config.glade.h:44
 msgid "Path:"
 msgstr "Chemin :"
 
-#: addressbook/gui/component/addressbook-config.c:503
+#: addressbook/gui/component/addressbook-config.c:508
 msgid "FIXME Path Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:508
+#: 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:642
+#: addressbook/gui/component/addressbook-config.c:647
 msgid "Edit Addressbook"
 msgstr "�diter le carnet d'adresses"
 
-#: addressbook/gui/component/addressbook-config.c:644
+#: addressbook/gui/component/addressbook-config.c:649
 msgid "Add Addressbook"
 msgstr "Ajouter un carnet d'adresses"
 
-#: addressbook/gui/component/addressbook-config.c:660
+#: addressbook/gui/component/addressbook-config.c:665
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
@@ -927,22 +922,22 @@ msgstr ""
 "S�lectionnez le type de carnet d'adresse que vous avez, et entrez les "
 "informations le concernant."
 
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:41
+#: addressbook/gui/component/addressbook-config.c:671
+#: mail/mail-config.glade.h:35
 msgid "Name:"
 msgstr "Nom :"
 
-#: addressbook/gui/component/addressbook-config.c:667
+#: addressbook/gui/component/addressbook-config.c:672
 msgid "FIXME Name help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:669
+#: 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:670
+#: addressbook/gui/component/addressbook-config.c:675
 msgid "FIXME Description help text here"
 msgstr ""
 
@@ -951,23 +946,24 @@ 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:11 mail/folder-browser.c:571
-#: mail/mail-config.glade.h:20 mail/mail-view.c:150
+#: 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:7 ui/evolution-task-editor-dialog.xml.h:18
+#: 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:22
+#: mail/mail-config.glade.h:23
 msgid "Edit"
 msgstr "�diter"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Name"
 msgstr "Nom"
 
@@ -975,49 +971,72 @@ msgstr "Nom"
 msgid "URI"
 msgstr "URI"
 
-#: addressbook/gui/component/e-address-widget.c:259
-#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#: 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/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"
 msgstr "Autres contacts"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for displaying an address."
+msgid "A Bonobo control for an address popup."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A sample Bonobo control which displays an addressbook."
+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:4
+#: 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:5
+#: 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:6
+#: 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:7
+#: 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:8
+#: 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:9
+#: 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"
@@ -1031,21 +1050,18 @@ msgstr "Conduit 'Contact' d'Evolution"
 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
+#: 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/component/select-names/e-select-names-popup.c:136
+#: addressbook/gui/component/select-names/e-select-names-popup.c:146
 #, fuzzy
 msgid "Remove All"
 msgstr "Enlever"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
-msgid "Edit Contact Info"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Rechercher..."
@@ -1062,7 +1078,7 @@ msgstr "S�lectionnez des noms"
 msgid "Select name from:"
 msgstr "S�lectionnez un nom depuis :"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
 msgid "Search"
 msgstr "Rechercher"
 
@@ -1174,73 +1190,174 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:481
-#: addressbook/gui/widgets/e-minicard.c:435
+#: 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
 msgid "Save as VCard"
 msgstr "Enregistrer comme VCard"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-minicard.c:669
+msgid "Send contact to other"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-minicard.c:670
+#, 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
+msgid "Print"
+msgstr "Imprimer"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-minicard.c:672
+#, fuzzy
+msgid "Print Envelope"
+msgstr "Imprimer une en_veloppe..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:641
 msgid "* Click here to add a contact *"
 msgstr "* Cliquez ici pour ajouter un contact *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/gui/widgets/e-addressbook-view.c:642
+#, fuzzy
+msgid "File As"
+msgstr "Classer comme :"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:644
 msgid "Email"
 msgstr "Adresse �lec."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:645
+#, fuzzy
+msgid "Primary Phone"
+msgstr "Principal"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:646
+#, fuzzy
+msgid "Assistant Phone"
+msgstr "Assistant"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:647
+#, fuzzy
+msgid "Business Phone"
+msgstr "Travail 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:648
+#, fuzzy
+msgid "Callback Phone"
+msgstr "R�pondeur"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:649
+#, fuzzy
+msgid "Company Phone"
+msgstr "Soci�t�"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:650
+#, fuzzy
+msgid "Home Phone"
+msgstr "Maison 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:651
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:595
+#: addressbook/gui/widgets/e-addressbook-view.c:652
+#, fuzzy
+msgid "Business Address"
+msgstr "Travail 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:653
+#, fuzzy
+msgid "Home Address"
+msgstr "Verifier l'adresse"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:654
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "Mobile"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:658
+#, fuzzy
+msgid "Business Phone 2"
+msgstr "Travail 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:659
+#, fuzzy
+msgid "Home Phone 2"
+msgstr "Maison 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:661
+#, fuzzy
+msgid "Other Phone"
+msgstr "Autres contacts"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:666
+#, fuzzy
+msgid "TTY"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:667
+#, fuzzy
+msgid "Other Address"
+msgstr "Verifier l'adresse"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:670
 msgid "Web Site"
 msgstr "Site Web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:596
+#: addressbook/gui/widgets/e-addressbook-view.c:671
 msgid "Department"
 msgstr "D�partement"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:597
+#: addressbook/gui/widgets/e-addressbook-view.c:672
 msgid "Office"
 msgstr "Bureau"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Title"
 msgstr "Titre"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:674
 msgid "Profession"
 msgstr "Profession"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:600
+#: addressbook/gui/widgets/e-addressbook-view.c:675
 msgid "Manager"
 msgstr "Gestionnaire"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 msgid "Nickname"
 msgstr "Surnom"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-view.c:678
 msgid "Spouse"
 msgstr "Conjoint(e)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: addressbook/gui/widgets/e-addressbook-view.c:679
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:606
-#, fuzzy
-msgid "Click here to add a contact"
-msgstr "* Cliquez ici pour ajouter un contact *"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-minicard-control.c:282
 msgid "Save in addressbook"
 msgstr "Enregistrer dans le carnet d'adresses"
 
-#: addressbook/gui/widgets/e-minicard-view.c:141
+#: addressbook/gui/widgets/e-minicard-view.c:166
 msgid ""
 "\n"
 "\n"
@@ -1254,7 +1371,7 @@ msgstr ""
 "\n"
 "Double-cliquez ici pour cr�er un nouveau contact."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #, fuzzy
 msgid "Card View"
 msgstr "Carte : "
@@ -1439,126 +1556,127 @@ msgstr "Ne peut lire le bloc d'application Calendrier du Pilot"
 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:233
+#: calendar/gui/calendar-commands.c:266
 msgid "File not found"
 msgstr "Fichier introuvable"
 
-#: calendar/gui/calendar-commands.c:257
+#: calendar/gui/calendar-commands.c:290
 msgid "Open calendar"
 msgstr "Ouvrir le calendrier"
 
-#: calendar/gui/calendar-commands.c:299
+#: calendar/gui/calendar-commands.c:332
 msgid "Save calendar"
 msgstr "Enregistrer le calendrier"
 
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:468
 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:366 calendar/gui/calendar-model.c:901
-#: calendar/gui/e-calendar-table.c:329
+#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
+#: calendar/gui/e-calendar-table.c:330
 msgid "Public"
 msgstr "Public"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
+#: calendar/gui/e-calendar-table.c:331
 msgid "Private"
 msgstr "Priv�"
 
-#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
+#: calendar/gui/e-calendar-table.c:332
 msgid "Confidential"
 msgstr "Confidentiel"
 
-#: 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:200
+#: 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
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: 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:351
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
 msgid "High"
 msgstr "Haute"
 
-#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
-#: calendar/gui/calendar-model.c:1596
+#: 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:352
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: 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:353
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
 msgid "Low"
 msgstr "Basse"
 
-#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
+#: calendar/gui/e-calendar-table.c:406
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
+#: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
 msgstr "Opaque"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: 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:425
+#: calendar/gui/e-calendar-table.c:426
 msgid "Not Started"
 msgstr "Non d�marr�e"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: 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:426
+#: calendar/gui/e-calendar-table.c:427
 msgid "In Progress"
 msgstr "En cours"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: 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:427
+#: calendar/gui/e-calendar-table.c:428
 msgid "Completed"
 msgstr "Compl�t�"
 
-#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: 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:428
+#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
+#: camel/camel-service.c:586
 msgid "Cancelled"
 msgstr "Annul�"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
 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:800 e-util/e-time-utils.c:285
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:805
+#: calendar/gui/calendar-model.c:799
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1569,24 +1687,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:885
+#: calendar/gui/calendar-model.c:879
 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:756
-#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
-#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
-#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
-#: 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: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
 msgid "None"
 msgstr "Aucune"
 
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:967
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1596,40 +1713,40 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1013
+#: calendar/gui/calendar-model.c:1007
 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:1054
+#: calendar/gui/calendar-model.c:1048
 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/calendar-model.c:1061
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:355
 msgid "Undefined"
 msgstr "Ind�fini"
 
-#: calendar/gui/calendar-model.c:1108
+#: calendar/gui/calendar-model.c:1102
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1598
+#: calendar/gui/calendar-model.c:1571
 #, fuzzy
 msgid "Recurring"
 msgstr "R�currence"
 
-#: calendar/gui/calendar-model.c:1600
+#: calendar/gui/calendar-model.c:1573
 #, fuzzy
 msgid "Assigned"
 msgstr "Assigner un score"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 #, fuzzy
 msgid "No"
 msgstr "Maintenant"
@@ -1696,24 +1813,24 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
-#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+#: 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/alarm-notify/notify-main.c:73
+#: calendar/gui/alarm-notify/notify-main.c:77
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "Ne peut cr�er de r�pertoire temporaire : %s"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+#: 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-notify-dialog.c:191
+#: 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-notify-dialog.c:202
+#: calendar/gui/dialogs/alarm-notify-dialog.c:207
 msgid "No summary available."
 msgstr "Aucun r�sum� disponible."
 
@@ -1802,7 +1919,7 @@ msgid "Display options"
 msgstr "Options d'affichage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:162
 msgid "Due Date"
 msgstr "Date d'�ch�ance"
 
@@ -1823,7 +1940,7 @@ msgid "Fri"
 msgstr "Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
 msgid "Friday"
 msgstr "Vendredi"
 
@@ -1852,7 +1969,7 @@ msgid "Mon"
 msgstr "Lun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
 msgid "Monday"
 msgstr "Lundi"
 
@@ -1865,11 +1982,12 @@ 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:34
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:165
 msgid "Priority"
 msgstr "Priorit�"
 
@@ -1887,7 +2005,7 @@ msgid "Sat"
 msgstr "Sam"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:482
 msgid "Saturday"
 msgstr "Samedi"
 
@@ -1912,7 +2030,7 @@ msgid "Sun"
 msgstr "Dim"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:483
 msgid "Sunday"
 msgstr "Dimanche"
 
@@ -1925,7 +2043,7 @@ msgid "Thu"
 msgstr "Jeu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
 msgid "Thursday"
 msgstr "Jeudi"
 
@@ -1946,7 +2064,7 @@ msgid "Tue"
 msgstr "Mar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
 msgid "Tuesday"
 msgstr "Mardi"
 
@@ -1959,7 +2077,7 @@ msgid "Wed"
 msgstr "Mer"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
 msgid "Wednesday"
 msgstr "Mercredi"
 
@@ -1972,34 +2090,34 @@ 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:84
+#: mail/mail-config.glade.h:78
 msgid "seconds."
 msgstr "secondes."
 
-#: calendar/gui/dialogs/delete-comp.c:68
+#: calendar/gui/dialogs/delete-comp.c:70
 #, 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:71
+#: calendar/gui/dialogs/delete-comp.c:73
 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:77
+#: calendar/gui/dialogs/delete-comp.c:79
 #, 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:80
+#: calendar/gui/dialogs/delete-comp.c:82
 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:86
+#: calendar/gui/dialogs/delete-comp.c:88
 #, 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:89
+#: calendar/gui/dialogs/delete-comp.c:91
 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 ?"
 
@@ -2013,7 +2131,7 @@ msgid "% Comp_lete:"
 msgstr "% Comp_l�t� :"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:158
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Classification"
@@ -2081,300 +2199,316 @@ msgstr "_Priorit� :"
 msgid "_Status:"
 msgstr "_�tat :"
 
-#: calendar/gui/dialogs/task-editor.c:689
+#: calendar/gui/dialogs/task-editor.c:697
 msgid "Edit Task"
 msgstr "�diter la t�che"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
+#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
 msgid "No summary"
 msgstr "Aucun r�sum�"
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
+#: 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/task-editor.c:704 calendar/gui/event-editor.c:386
+#: 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/task-editor.c:707 calendar/gui/event-editor.c:389
+#: 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/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:157
 msgid "Categories"
 msgstr "Cat�gories"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:159
 #, fuzzy
 msgid "Completion Date"
 msgstr "Compl�t�e"
 
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:160
 msgid "End Date"
 msgstr "Date de fin"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:161
 msgid "Start Date"
 msgstr "Date de d�but"
 
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:163
 msgid "Geographical Position"
 msgstr "Emplacement g�ographique"
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:164
 #, fuzzy
 msgid "Percent complete"
 msgstr "Marque la t�che comme compl�t�e"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:166
 msgid "Summary"
 msgstr "R�sum�"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:167
 msgid "Transparency"
 msgstr "Transparence"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:168
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/e-calendar-table.c:169
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.c:169
+#: calendar/gui/e-calendar-table.c:170
 msgid "Click here to add a task"
 msgstr "Cliquez ici pour ajouter une t�che"
 
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:374
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:375
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:376
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:377
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:378
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:379
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:380
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:381
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:382
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:383
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:384
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:550
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark Complete"
 msgstr "Marquer comme termin�e"
 
-#: calendar/gui/e-calendar-table.c:551
+#: 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:556
+#: calendar/gui/e-calendar-table.c:557
 msgid "Edit this task..."
 msgstr "�diter cette t�che..."
 
-#: calendar/gui/e-calendar-table.c:557
+#: calendar/gui/e-calendar-table.c:558
 msgid "Edit the task"
 msgstr "�dite la t�che"
 
-#: calendar/gui/e-calendar-table.c:559
+#: calendar/gui/e-calendar-table.c:560
 #: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "Supprimer la t�che"
 
-#: calendar/gui/e-calendar-table.c:560
+#: calendar/gui/e-calendar-table.c:561
 msgid "Delete the task"
 msgstr "Supprime la t�che"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
 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:271 calendar/gui/e-day-view.c:1274
-#: calendar/gui/e-week-view-main-item.c:321
+#: 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"
 
 #. 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:1288
-#: calendar/gui/e-week-view-main-item.c:330
+#: 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:279 calendar/gui/e-day-view.c:1301
-#: calendar/gui/e-week-view-main-item.c:344
+#: 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"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:613
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:617
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
-#: calendar/gui/print.c:612
+#: 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-day-view.c:3020 calendar/gui/e-day-view.c:3034
-#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
+#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "New Appointment..."
-msgstr "Nouveau rendez-vous..."
+msgid "New Appointment"
+msgstr "Nouveau rendez-vous"
+
+#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
+#, fuzzy
+msgid "New All Day Event"
+msgstr "_Toute la journ�e"
 
-#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
-#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
+#, fuzzy
+msgid "Go to Today"
+msgstr "Aller � aujourd'hui"
+
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#, fuzzy
+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:3028 calendar/gui/e-week-view.c:3236
+#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete this Appointment"
 msgstr "Supprimer ce rendez-vous"
 
-#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: 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:3043 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
 #, fuzzy
 msgid "Make this Occurrence Movable"
 msgstr "Rendre ce rendez-vous d�pla�able"
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Supprimer cette occurence"
 
-#: calendar/gui/e-day-view.c:3047
+#: calendar/gui/e-day-view.c:3179
 #, fuzzy
 msgid "Delete all Occurrences"
 msgstr "Supprimer toutes les occurences"
 
-#: calendar/gui/e-itip-control.c:153
+#: 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:159 calendar/gui/e-itip-control.c:502
+#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
 #, fuzzy
 msgid "Component successfully updated."
 msgstr "Les fichiers d'Evolution sont correctement install�s."
 
-#: calendar/gui/e-itip-control.c:165
+#: calendar/gui/e-itip-control.c:173
 msgid "There was an error loading the calendar file."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:189
+#: 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:450 calendar/gui/e-itip-control.c:521
+#: 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:462
+#: 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:475
+#: calendar/gui/e-itip-control.c:483
 msgid "This is a reply from someone who was uninvited!"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:491
+#: calendar/gui/e-itip-control.c:499
 #, fuzzy
 msgid "I couldn't update your calendar store."
 msgstr "Ne peut cr�er un calendrier dans `%s'"
 
-#: calendar/gui/e-itip-control.c:532
+#: calendar/gui/e-itip-control.c:540
 msgid "I couldn't delete the calendar component!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:542
+#: 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:686
+#: calendar/gui/e-itip-control.c:694
 msgid "I don't recognize this type of calendar component."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:780
 msgid "Add to Calendar"
 msgstr "Ajouter au calendrier"
 
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
+#: calendar/gui/e-itip-control.c:814
+#, fuzzy
+msgid " Accept "
 msgstr "Accepter"
 
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
+#: calendar/gui/e-itip-control.c:815
+#, fuzzy
+msgid " Decline "
 msgstr "Refuser"
 
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
+#: calendar/gui/e-itip-control.c:816
+#, fuzzy
+msgid " Tentative "
 msgstr "Essai"
 
-#: calendar/gui/e-itip-control.c:852
+#: calendar/gui/e-itip-control.c:860
 msgid "Update Calendar"
 msgstr "Mettre � jour le calendrier"
 
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:883
 msgid "Cancel Meeting"
 msgstr "Annuler la r�union"
 
@@ -2392,7 +2526,7 @@ msgstr ""
 msgid "Calendar Message"
 msgstr "Calendrier"
 
-#: calendar/gui/e-itip-control.glade.h:5
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
 #, fuzzy
 msgid "Date:"
 msgstr "Date"
@@ -2407,9 +2541,10 @@ msgstr "Chargement du calendrier"
 msgid "Organizer:"
 msgstr "Organisation :"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
-msgid "Sender"
-msgstr "Exp�diteur"
+#: 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
@@ -2503,26 +2638,26 @@ msgid ""
 "Time"
 msgstr "S�lectionnez un Dossier"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
-#: mail/message-list.c:1171
+#: 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:148 calendar/gui/e-tasks.c:468
-#: calendar/gui/e-tasks.c:501
+#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
+#: calendar/gui/e-tasks.c:502
 msgid "All"
 msgstr "Tous"
 
-#: calendar/gui/e-tasks.c:154
+#: calendar/gui/e-tasks.c:155
 msgid "Category:"
 msgstr "Cat�gorie :"
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:298
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ne peut charger la t�che dans � %s �"
 
-#: calendar/gui/e-tasks.c:309
+#: calendar/gui/e-tasks.c:310
 #, 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"
@@ -2530,11 +2665,16 @@ 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:338
+#: calendar/gui/e-week-view-main-item.c:342
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3255
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+#, fuzzy
+msgid "New Appointment..."
+msgstr "Nouveau rendez-vous..."
+
+#: calendar/gui/e-week-view.c:3314
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Supprimer toutes les occurences"
@@ -2572,7 +2712,7 @@ msgid "No recurrence"
 msgstr "Aucune r�currence"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1577
+#: calendar/gui/event-editor.c:1579
 msgid "Play a sound"
 msgstr ""
 
@@ -2593,22 +2733,22 @@ msgid "Reminder"
 msgstr "Alarme"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1586
+#: 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:1583
+#: 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:25
+#: 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:1580
+#: calendar/gui/event-editor.c:1582
 msgid "Show a dialog"
 msgstr "Afficher un dialogue"
 
@@ -2628,12 +2768,11 @@ msgstr "Heure de _d�but :"
 msgid "_Starting date:"
 msgstr "Date de _d�but :"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
+#: 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:6
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
 msgid "before"
 msgstr "avant"
 
@@ -2658,7 +2797,7 @@ msgstr "toujours"
 msgid "hour(s)"
 msgstr "heure(s)"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
 msgid "minute(s)"
 msgstr "minute(s)"
 
@@ -2683,101 +2822,101 @@ msgstr "semaine(s)"
 msgid "year(s)"
 msgstr "ann�e(s)"
 
-#: calendar/gui/event-editor.c:371
+#: calendar/gui/event-editor.c:373
 msgid "Edit Appointment"
 msgstr "�diter le rendez-vous"
 
-#: calendar/gui/event-editor.c:449
+#: calendar/gui/event-editor.c:451
 msgid "on"
 msgstr "le"
 
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
 msgid "day"
 msgstr "jour"
 
-#: calendar/gui/event-editor.c:601
+#: calendar/gui/event-editor.c:603
 msgid "on the"
 msgstr "dans le"
 
-#: calendar/gui/event-editor.c:608
+#: calendar/gui/event-editor.c:610
 msgid "th"
 msgstr "i�me"
 
-#: calendar/gui/event-editor.c:754
+#: calendar/gui/event-editor.c:756
 msgid "occurrences"
 msgstr "occurences"
 
-#: calendar/gui/event-editor.c:871
+#: 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:1532
+#: calendar/gui/event-editor.c:1534
 #, c-format
 msgid " %d days"
 msgstr " %d jours"
 
-#: calendar/gui/event-editor.c:1534
+#: calendar/gui/event-editor.c:1536
 msgid " 1 day"
 msgstr " 1 jour"
 
-#: calendar/gui/event-editor.c:1537
+#: calendar/gui/event-editor.c:1539
 #, c-format
 msgid " %d weeks"
 msgstr " %d semaines"
 
-#: calendar/gui/event-editor.c:1539
+#: calendar/gui/event-editor.c:1541
 msgid " 1 week"
 msgstr " 1 semaine"
 
-#: calendar/gui/event-editor.c:1542
+#: calendar/gui/event-editor.c:1544
 #, c-format
 msgid " %d hours"
 msgstr " %d heures"
 
-#: calendar/gui/event-editor.c:1544
+#: calendar/gui/event-editor.c:1546
 msgid " 1 hour"
 msgstr " 1 heure"
 
-#: calendar/gui/event-editor.c:1547
+#: calendar/gui/event-editor.c:1549
 #, c-format
 msgid " %d minutes"
 msgstr " %d minutes"
 
-#: calendar/gui/event-editor.c:1549
+#: calendar/gui/event-editor.c:1551
 msgid " 1 minute"
 msgstr " 1 minute"
 
-#: calendar/gui/event-editor.c:1552
+#: calendar/gui/event-editor.c:1554
 #, c-format
 msgid " %d seconds"
 msgstr " %d secondes"
 
-#: calendar/gui/event-editor.c:1554
+#: calendar/gui/event-editor.c:1556
 msgid " 1 second"
 msgstr " 1 seconde"
 
-#: calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1603
 #, fuzzy
 msgid " before start of appointment"
 msgstr "Cr�e un nouveau rendez-vous"
 
-#: calendar/gui/event-editor.c:1603
+#: calendar/gui/event-editor.c:1605
 #, fuzzy
 msgid " after start of appointment"
 msgstr "Cr�e un nouveau rendez-vous"
 
-#: calendar/gui/event-editor.c:1611
+#: 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:1613
+#: calendar/gui/event-editor.c:1615
 #, fuzzy
 msgid " after end of appointment"
 msgstr "Cr�e un nouveau rendez-vous"
 
-#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
-#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
+#: 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"
 
@@ -2817,12 +2956,12 @@ msgstr ""
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:695
+#: calendar/gui/gnome-cal.c:700
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ne peut ouvrir le dossier dans � %s �"
 
-#: calendar/gui/gnome-cal.c:706
+#: calendar/gui/gnome-cal.c:711
 #, 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"
@@ -2883,201 +3022,201 @@ msgstr "Octobre"
 msgid "September"
 msgstr "Septembre"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "1st"
 msgstr "1er"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "2nd"
 msgstr "2�me"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "3rd"
 msgstr "3�me"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "4th"
 msgstr "4�me"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "5th"
 msgstr "5�me"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "6th"
 msgstr "6�me"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "7th"
 msgstr "7�me"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "8th"
 msgstr "8�me"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "9th"
 msgstr "9�me"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "10th"
 msgstr "10�me"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "11th"
 msgstr "11�me"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "12th"
 msgstr "12�me"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "13th"
 msgstr "13�me"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "14th"
 msgstr "14�me"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "15th"
 msgstr "15�me"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "16th"
 msgstr "16�me"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "17th"
 msgstr "17�me"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "18th"
 msgstr "18�me"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "19th"
 msgstr "19�me"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "20th"
 msgstr "20�me"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "21st"
 msgstr "21�me"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "22nd"
 msgstr "22�me"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "23rd"
 msgstr "23�me"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "24th"
 msgstr "24�me"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "25th"
 msgstr "25�me"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "26th"
 msgstr "26�me"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "27th"
 msgstr "27�me"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "28th"
 msgstr "28�me"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "29th"
 msgstr "29�me"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "30th"
 msgstr "30�me"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:306
 msgid "31st"
 msgstr "31�me"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Su"
 msgstr "Di"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Th"
 msgstr "Je"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Sa"
 msgstr "Sa"
 
-#: calendar/gui/print.c:944
+#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "T�ches"
 
 #. Day
-#: calendar/gui/print.c:1074
+#: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
 msgstr "Jour en cours (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1089
+#: calendar/gui/print.c:1093
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1104
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Semaine en cours (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1108
+#: calendar/gui/print.c:1112
 msgid "Current month (%b %Y)"
 msgstr "Mois en cours (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1115
+#: calendar/gui/print.c:1119
 msgid "Current year (%Y)"
 msgstr "Ann�e en cours (%Y)"
 
-#: calendar/gui/print.c:1152
+#: calendar/gui/print.c:1156
 msgid "Print Calendar"
 msgstr "Imprimer le Calendrier"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:32
+#: 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
 msgid "Print Preview"
 msgstr "Aper�u Avant Impression"
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/tasks-control.c:108
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "L'URI que le calendrier affichera"
@@ -3110,26 +3249,103 @@ 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 "DLMMJVS"
 
-#: camel/camel-filter-driver.c:790
+#: camel/camel-cipher-context.c:169
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, fuzzy
+msgid "Syncing folders"
+msgstr "Synchronisation du dossier"
+
+#: camel/camel-filter-driver.c:643
+#, fuzzy
+msgid "Unable to open spool folder"
+msgstr "Impossible d'ouvrir le carnet d'adresses"
+
+#: camel/camel-filter-driver.c:652
+#, fuzzy
+msgid "Unable to process spool folder"
+msgstr ""
+"Ne peut enregistrer le dossier � %s � :\n"
+"%s"
+
+#: camel/camel-filter-driver.c:666
+#, 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
+#, fuzzy, c-format
+msgid "Failed message %d"
+msgstr "_Message �lectronique (FIXME)"
+
+#: camel/camel-filter-driver.c:671
+#, fuzzy
+msgid "Cannot open message"
+msgstr "Ne peut obtenir le message : %s"
+
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Failed at message %d of %d"
+msgstr "�criture du message %d du %d"
+
+#: camel/camel-filter-driver.c:866
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: camel/camel-filter-driver.c:795
+#: camel/camel-filter-driver.c:871
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: camel/camel-folder-search.c:323
+#: camel/camel-folder-search.c:328
 #, fuzzy, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3138,7 +3354,7 @@ msgstr ""
 "Erreur durant le pr�paration vers %s :\n"
 "%s"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:338
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3147,155 +3363,227 @@ msgstr ""
 "Erreur durant le pr�paration vers %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 ""
 
 #. 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 camel/camel-movemail.c:138
+#: camel/camel-movemail.c:185
 #, 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:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151 camel/camel-movemail.c:219
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "�ch�ance du d�lai pour obtenir le fichier de verrouillage sur %s. Essayez de "
 "nouveau plus tard."
 
-#: camel/camel-lock.c:199
+#: camel/camel-lock.c:201
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Impossible d'obtenir le verrou avec fcntl(2) : %s"
 
-#: camel/camel-lock.c:253
+#: camel/camel-lock.c:255
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Impossible d'obtenir le verrou avec flock(2) : %s"
 
-#: camel/camel-movemail.c:99
+#: camel/camel-movemail.c:101
 #, 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:146
+#: camel/camel-movemail.c:148
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Ne peut ouvrir le fichier de courrier %s : %s"
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:158
 #, 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:197
+#: 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:243
+#: 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:254
+#: 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:272
+#: camel/camel-movemail.c:274
 #, 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:304
+#: camel/camel-movemail.c:306
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Ne peut cr�er le tube : %s"
 
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:318
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Ne peut cloner : %s"
 
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:356
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "�chec du programme movemail : %s"
 
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:357
 msgid "(Unknown error)"
 msgstr "(Erreur inconnue)"
 
-#: camel/camel-provider.c:137
+#: camel/camel-movemail.c:587
+#, 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
+#, 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
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Veuillez saisir votre %s phrase de passe"
+
+#: camel/camel-pgp-context.c:509
+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
+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
+#, 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
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:871
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:888
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Ne peut cr�er de fichier temporaire : %s"
+
+#: camel/camel-pgp-context.c:1011
+msgid "No plaintext to encrypt."
+msgstr ""
+
+#: camel/camel-pgp-context.c:1037
+msgid "No recipients specified"
+msgstr "Aucun destinataires sp�cifi�s"
+
+#: camel/camel-pgp-context.c:1227
+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 "Ne peut charger %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 "Ne peut charger %s : Aucun code d'initialisation dans le module."
 
-#: camel/camel-remote-store.c:181
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s server %s"
 msgstr "%s serveur %s"
 
-#: camel/camel-remote-store.c:185
+#: camel/camel-remote-store.c:190
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s service pour %s sur %s"
 
-#: camel/camel-remote-store.c:232
+#: camel/camel-remote-store.c:240
 msgid "Connection cancelled"
 msgstr "Connexion annul�e"
 
-#: camel/camel-remote-store.c:235
-#: camel/providers/smtp/camel-smtp-transport.c:244
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:261
 #, 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:236
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(h�te inconnu)"
 
-#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
-#: camel/camel-remote-store.c:448
-#: camel/providers/imap/camel-imap-command.c:289
+#: 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
 msgid "Operation cancelled"
 msgstr "Op�ration annul�e"
 
-#: camel/camel-remote-store.c:453
+#: camel/camel-remote-store.c:464
 #, fuzzy
 msgid "Server unexpectedly disconnected"
 msgstr "Serveur d�connect�."
 
-#: 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 ""
+"Cette option vous connectera au serveur IMAP en utilisant un mots de passe "
+"en clair."
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Identification"
 
-#: 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
 #, fuzzy, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -3304,18 +3592,18 @@ msgstr ""
 "Erreur de chargement des information du filtre :\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:130
+#: camel/camel-sasl-anonymous.c:143
 #, fuzzy, c-format
 msgid ""
 "Invalid trace information:\n"
 "%s"
 msgstr "Information utilisateur"
 
-#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+#: 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
 #, fuzzy
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
@@ -3324,11 +3612,11 @@ msgstr ""
 "Cela vous connectera au serveur SMTP en utilisant une identification "
 "CRAM-MD5."
 
-#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+#: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:39
+#: camel/camel-sasl-digest-md5.c:45
 #, fuzzy
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
@@ -3337,44 +3625,44 @@ msgstr ""
 "Cette option vous connectera au serveur IMAP en utilisant un mots de passe "
 "en clair."
 
-#: 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
 #, fuzzy
 msgid "Server response did not contain authorization data\n"
 msgstr "La r�ponse du serveur IMAP ne contient pas l'information %s"
 
-#: 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
 #, fuzzy
 msgid "Server response does not match\n"
 msgstr "La r�ponse du serveur s'est termin�e trop tot."
 
-#: 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
 #, fuzzy
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "Cette option vous connectera au serveur IMAP en utilisant Kerberos 4 pour "
 "vous identifier."
 
-#: camel/camel-sasl-kerberos4.c:158
+#: camel/camel-sasl-kerberos4.c:161
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -3383,69 +3671,73 @@ msgstr ""
 "Ne peut obtenir le ticket Kerberos :\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:381
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:417
 msgid "Bad authentication response from server."
 msgstr "Mauvaise r�ponse d'identification du serveur."
 
-#: camel/camel-sasl-plain.c:29
-msgid "PLAIN"
-msgstr ""
-
-#: camel/camel-sasl-plain.c:31
+#: camel/camel-sasl-plain.c:34
 #, fuzzy
-msgid ""
-"This option will connect to the server using a the PLAIN SASL mechanism if "
-"the server supports it."
+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:105
+#: camel/camel-search-private.c:110
 #, 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:142
+#: camel/camel-service.c:152
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL � %s � a besoin du composant � nom d'utilisateur �"
 
-#: camel/camel-service.c:151
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL � %s � a besoin du composant � h�te �"
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:168
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL � %s � a besoin du composant � chemin �"
 
-#: camel/camel-service.c:512
+#: camel/camel-service.c:554
+#, fuzzy, c-format
+msgid "Resolving: %s"
+msgstr "Test de \"%s\""
+
+#: camel/camel-service.c:581
 #, c-format
-msgid "No such host %s."
-msgstr "Aucun h�te %s."
+msgid "Failure in name lookup: %s"
+msgstr ""
+
+#: camel/camel-service.c:606
+#, c-format
+msgid "Host lookup failed: %s: host not found"
+msgstr ""
 
-#: camel/camel-service.c:515
+#: camel/camel-service.c:608
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Temporairement impossible de r�soudre le nom d'h�te %s."
+msgid "Host lookup failed: %s: unknown reason"
+msgstr ""
 
-#: camel/camel-session.c:54
+#: camel/camel-session.c:57
 msgid "Virtual folder email provider"
 msgstr "Founisseur de dossier de courrier virtuel"
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:59
 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:322
+#: camel/camel-session.c:274 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:417
+#: camel/camel-session.c:462
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3455,123 +3747,150 @@ msgstr ""
 "%s"
 
 #. Fill in the new fields
-#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
-#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#: 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
 #, fuzzy
 msgid "Trash"
 msgstr "T�che"
 
-#: camel/camel-url.c:77
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "La cha�ne d'URL � %s � ne contient pas de protocole"
-
-#: camel/camel-url.c:92
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "La cha�ne d'URL � %s � contient un protocole invalide"
+#: camel/camel-url.c:289
+#, fuzzy, c-format
+msgid "Could not parse URL `%s'"
+msgstr ""
+"Impossible d'ouvrir le fichier � %s � :\n"
+"%s"
 
-#: camel/camel-url.c:152
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "Le num�ro de port dans l'URL � %s � n'est pas num�rique"
+#: camel/camel-vee-folder.c:451
+#, fuzzy, c-format
+msgid "No such message %s in %s"
+msgstr "Aucun message correspondant"
 
-#: camel/camel-vee-folder.c:960
+#: camel/camel-vee-folder.c:545
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "Aucun message correspondant"
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:209
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "R�ponse innatendue du serveur IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:217
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "�chec de la commande IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
+#: 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:297
+#: camel/providers/imap/camel-imap-command.c:272
 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:433
+#: camel/providers/imap/camel-imap-command.c:456
 #, 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:469
+#: camel/providers/imap/camel-imap-command.c:490
 #, 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:199
+#: camel/providers/imap/camel-imap-folder.c:172
 #, 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:329
+#: camel/providers/imap/camel-imap-folder.c:351
 #, fuzzy
 msgid "Scanning IMAP folder"
 msgstr "Scrutation des dossiers dans � %s �"
 
-#: camel/providers/imap/camel-imap-folder.c:837
-#: camel/providers/imap/camel-imap-folder.c:999
+#: camel/providers/imap/camel-imap-folder.c:986
+#: camel/providers/imap/camel-imap-folder.c:1197
+#, 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
 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:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Checking for new mail"
+msgstr "Cr�e une nouveau contact"
 
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "Pour la lecture et le stockage du courrier sur des serveurs IMAP."
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Check for new messages in all folders"
+msgstr "Marquage des messages du dossier \"%s\""
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+msgid "Folders"
+msgstr "Dossiers"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 #, fuzzy
-msgid "Secure IMAPv4"
-msgstr "IMAPv4"
+msgid "Show only subscribed folders"
+msgstr "S'abonne au dossier � %s �"
+
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Override server-supplied folder namespace"
+msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap/camel-imap-provider.c:54
 #, fuzzy
-msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgid "Namespace"
+msgstr "Espace de nom :"
+
+#: 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:65
+msgid "For reading and storing mail on IMAP servers."
 msgstr "Pour la lecture et le stockage du courrier sur des serveurs IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:263
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Cette option vous connectera au serveur IMAP en utilisant un mots de passe "
 "en clair."
 
-#: camel/providers/imap/camel-imap-store.c:415
+#: camel/providers/imap/camel-imap-store.c:440
 #, 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:426
+#: camel/providers/imap/camel-imap-store.c:450
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Aucune identification requise"
 
-#: camel/providers/imap/camel-imap-store.c:454
+#: camel/providers/imap/camel-imap-store.c:475
 #, 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:469
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:403
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:498
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: camel/providers/imap/camel-imap-store.c:518
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3582,95 +3901,104 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:772
+#: camel/providers/imap/camel-imap-store.c:865
+#, 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"
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/imap/camel-imap-store.c:1382
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:39
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "R�pertoires de courrier au format UNIX MH (version CamelLocal)"
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:40
 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:47
+#: camel/providers/local/camel-local-provider.c:49
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:50
 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:58
+#: camel/providers/local/camel-local-provider.c:59
 #, fuzzy
 msgid "Qmail maildir-format mail files"
 msgstr "Fichiers de courrier au format UNIX qmail maildir"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 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:128
+#: camel/providers/local/camel-local-store.c:129
 #, 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:135
+#: camel/providers/local/camel-local-store.c:136
 #, 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:143
-#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:144
+#: camel/providers/local/camel-local-store.c:160
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne peut obtenir le r�pertoire : %s : %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:175
 #, 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:184
+#: camel/providers/local/camel-local-store.c:185
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fichier de courrier local %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:241
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Impossible de renommer le dossier %s vers %s : %s"
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:283
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Impossible de supprimer le fichier de r�sum� de dossier � %s � : %s"
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:293
 #, 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:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
+#: camel/providers/local/camel-maildir-folder.c:150
+#: camel/providers/local/camel-maildir-folder.c:158
+#: camel/providers/local/camel-maildir-folder.c:169
 #, 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: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: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
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3679,19 +4007,19 @@ msgstr ""
 "Impossible d'obtenir le message : %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:197
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
 msgid "No such message"
 msgstr "Aucun message correspondant"
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:203
 msgid "Invalid message contents"
 msgstr "Contenu de message invalide"
 
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
+#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -3700,15 +4028,15 @@ msgstr ""
 "Ne peut ouvrir le dossier � %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:100
+#: 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:105
-#: camel/providers/local/camel-mh-store.c:101
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3717,35 +4045,40 @@ msgstr ""
 "Ne peut cr�er le dossier � %s � :\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:120
+#: camel/providers/local/camel-maildir-store.c:122
 #, 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:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
+#: camel/providers/local/camel-maildir-store.c:151
+#: camel/providers/local/camel-maildir-store.c:188
+#: 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:150
+#: camel/providers/local/camel-maildir-store.c:152
 msgid "not a maildir directory"
 msgstr "n'est pas un r�pertoire maildir"
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:152
+#, 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
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ne peut ouvrir la bo�te � lettres : %s : %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, c-format
 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:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:335
+#: camel/providers/local/camel-mbox-folder.c:367
+#: camel/providers/local/camel-mbox-folder.c:380
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3754,15 +4087,15 @@ msgstr ""
 "Impossible d'obtenir le message : %s du dossier %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:368
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Le dossier semble irr�m�diablement corrompu"
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:381
 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"
@@ -3771,7 +4104,7 @@ msgstr ""
 "Impossible d'ouvrir le fichier � %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"
@@ -3780,14 +4113,14 @@ msgstr ""
 "Ne peut cr�er le fichier � %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 � n'est pas un fichier normal."
 
-#: 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"
@@ -3796,116 +4129,116 @@ msgstr ""
 "Ne peut supprimer le dossier � %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 "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:240
+#: camel/providers/local/camel-mbox-summary.c:248
 #, fuzzy
 msgid "Summarising folder"
 msgstr "Synchronisation du dossier"
 
-#: camel/providers/local/camel-mbox-summary.c:245
+#: camel/providers/local/camel-mbox-summary.c:253
 #, 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:287
+#: camel/providers/local/camel-mbox-summary.c:295
 #, 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:362
+#: camel/providers/local/camel-mbox-summary.c:370
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Ne peut r�sumer le dossier : %s :%s"
 
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
+#: camel/providers/local/camel-mbox-summary.c:501
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
 msgid "Synchronising folder"
 msgstr "Synchronisation du dossier"
 
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:506
+#: camel/providers/local/camel-mbox-summary.c:707
 #, 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:515
+#: camel/providers/local/camel-mbox-summary.c:523
 #, 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:540
 #: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:556
 #: camel/providers/local/camel-mbox-summary.c:745
+#: camel/providers/local/camel-mbox-summary.c:753
 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:591
+#: camel/providers/local/camel-mbox-summary.c:599
 #, 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:608
+#: camel/providers/local/camel-mbox-summary.c:616
 #, 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:626
-#: camel/providers/local/camel-mbox-summary.c:795
+#: camel/providers/local/camel-mbox-summary.c:634
+#: camel/providers/local/camel-mbox-summary.c:803
 #, 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:635
+#: camel/providers/local/camel-mbox-summary.c:643
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Impossible de fermer le dossier temporaire : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:646
+#: camel/providers/local/camel-mbox-summary.c:654
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossible de renommer le dossier : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:870
+#: camel/providers/local/camel-mbox-summary.c:878
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erreur inconnue : %s"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:149
+#: camel/providers/local/camel-mh-folder.c:157
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Impossible de concat�ner le message au dossier 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 � n'est pas un r�pertoire."
 
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: 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:62
+#: camel/providers/nntp/camel-nntp-auth.c:66
 msgid "Server rejected username"
 msgstr "Le serveur a rejet� le nom d'utilisateur"
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:72
 msgid "Failed to send username to server"
 msgstr "�chec d'envoi du nom d'utilisateur au serveur"
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:81
 msgid "Server rejected username/password"
 msgstr "Le serveur a rejet� le nom d'utilisateur / mot de passe"
 
@@ -3930,11 +4263,11 @@ msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 "Inpossible de sauvegarder le fichier de la liste des groupes pour %s : %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr "Nouvelles 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 ""
 "C'est un fournisseur pour la lecture et la publication dans les groupes de "
@@ -3964,36 +4297,51 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Incapable d'ouvrir ou de cr�er un fichier .newsrc pour %s : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:145
+#: camel/providers/pop3/camel-pop3-folder.c:149
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "R�cup�ration des messages"
 
-#: camel/providers/pop3/camel-pop3-folder.c:188
+#: camel/providers/pop3/camel-pop3-folder.c:192
 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:282
+#: camel/providers/pop3/camel-pop3-folder.c:285
 #, c-format
 msgid "No message with uid %s"
 msgstr "Aucun message avec l'uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:286
+#: camel/providers/pop3/camel-pop3-folder.c:289
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "R�cup�ration du message %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:304
+#: camel/providers/pop3/camel-pop3-folder.c:307
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Ne pas r�cup�rer le message du serveur POP %s : %s"
 
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
+#, fuzzy
+msgid "Message storage"
+msgstr "En-t�te du message"
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+#, fuzzy
+msgid "Leave messages on server"
+msgstr "Ne pas effacer les messages du serveur"
+
+#: camel/providers/pop3/camel-pop3-provider.c:41
+#, fuzzy, c-format
+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
 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."
@@ -4002,22 +4350,7 @@ msgstr ""
 "pour r�cup�rer les courriers depuis certains fournisseurs de courriers Web "
 "et de syst�mes de courriers propri�taires."
 
-#: camel/providers/pop3/camel-pop3-provider.c:54
-msgid "Secure POP"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:56
-#, fuzzy
-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 ""
-"Pour la connexion aux serveurs POP. Le protocole POP peut aussi �tre utilis� "
-"pour r�cup�rer les courriers depuis certains fournisseurs de courriers Web "
-"et de syst�mes de courriers propri�taires."
-
-#: camel/providers/pop3/camel-pop3-store.c:147
+#: 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."
@@ -4025,7 +4358,7 @@ msgstr ""
 "Cette option vous connectera au serveur POP en utilisant un mot de passe en "
 "clair. C'est la seul option support� par la plupart des serveurs POP."
 
-#: camel/providers/pop3/camel-pop3-store.c:157
+#: 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 "
@@ -4035,29 +4368,29 @@ msgstr ""
 "chiffr� via le protocole APOP. Cela peut ne pas fonctionner pour tous les "
 "utilisateurs m�me si le serveur pr�tend pouvoir le supporter."
 
-#: camel/providers/pop3/camel-pop3-store.c:169
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Cela vous connectera au serveur POP et utilisera Kerberos 4 pour vous "
 "identifier."
 
-#: camel/providers/pop3/camel-pop3-store.c:214
+#: camel/providers/pop3/camel-pop3-store.c:207
 #, 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:331
+#: camel/providers/pop3/camel-pop3-store.c:319
 #, 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:378
+#: camel/providers/pop3/camel-pop3-store.c:358
 #, 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:397
+#: camel/providers/pop3/camel-pop3-store.c:377
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4066,12 +4399,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:400
-#: camel/providers/pop3/camel-pop3-store.c:437
+#: camel/providers/pop3/camel-pop3-store.c:380
+#: camel/providers/pop3/camel-pop3-store.c:417
 msgid "(Unknown)"
 msgstr "(Inconnu)"
 
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:407
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4079,7 +4412,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:435
+#: camel/providers/pop3/camel-pop3-store.c:415
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4088,17 +4421,17 @@ 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:543
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Aucun dossier � %s �."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:57
 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."
@@ -4106,355 +4439,351 @@ msgstr ""
 "Pour d�livrer le courrier en passant par le programme � sendmail � sur le "
 "syst�me 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 "Ne peut cr�er de tube vers sendmail : %s : courrier non envoy�"
 
-#: 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 "Ne peut cloner sendmail : %s : courrier non envoy�"
 
-#: 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 "Impossible d'envoyer le message : %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 s'est termin� avec le signal %s : courrier non envoy�."
 
-#: 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 "Ne peut ex�cuter %s : courrier non envoy�."
 
-#: 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 s'est terrmin� avec l'�tat %d : courrier non envoy�."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
 #, fuzzy
 msgid "Could not find 'From' address in message"
 msgstr "Ne peut trouver le corps du message dans la r�ponse FETCH."
 
-#: 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 "Livraison du courrier via le programme sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:36
+#: camel/providers/smtp/camel-smtp-provider.c:40
 #, fuzzy
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Pour livrer le courrier en vous connectant � un distributeur distant "
 "utilisant SMTP."
 
-#: camel/providers/smtp/camel-smtp-provider.c:53
-msgid "Secure SMTP"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-provider.c:55
-#, fuzzy
-msgid ""
-"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
-"connection.\n"
-msgstr ""
-"Pour livrer le courrier en vous connectant � un distributeur distant "
-"utilisant SMTP."
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Command not implemented"
 msgstr "Commande non impl�ment�e"
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Help message"
 msgstr "Message d'aide"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Service ready"
 msgstr "Service pret"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Transaction failed"
 msgstr "�chec de la transaction"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:207
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Aucun mot de passe fournit."
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:211
 #, 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:195
+#: camel/providers/smtp/camel-smtp-transport.c:213
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Aucune identification requise"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:215
 #, fuzzy
 msgid "Authentication required"
 msgstr "Aucune identification requise"
 
-#: camel/providers/smtp/camel-smtp-transport.c:286
+#: camel/providers/smtp/camel-smtp-transport.c:305
 #, 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:358
+#: camel/providers/smtp/camel-smtp-transport.c:348
+#, 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
 #, 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:466
-msgid "No authentication required"
-msgstr "Aucune identification requise"
-
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/smtp/camel-smtp-transport.c:411
+#, fuzzy, c-format
 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."
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
 msgstr ""
-"Cette option vous connectera au serveur SMTP sans utiliser d'identification. "
-"Cela devrait �tre suffisant pour se connecter � la plupart des serveurs SMTP."
+"Impossible de vous identifier sur le serveur IMAP.\n"
+"%s\n"
+"\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:511
+#: camel/providers/smtp/camel-smtp-transport.c:527
 #, c-format
 msgid "SMTP server %s"
 msgstr "Serveur SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:529
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Livraison du courrier SMTP via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:554
 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:545
+#: camel/providers/smtp/camel-smtp-transport.c:561
 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:559
+#: camel/providers/smtp/camel-smtp-transport.c:575
 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:653
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
-#: camel/providers/smtp/camel-smtp-transport.c:719
+#: camel/providers/smtp/camel-smtp-transport.c:721
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:736
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, 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:777
+#: camel/providers/smtp/camel-smtp-transport.c:798
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Mauvaise r�ponse d'identification du serveur."
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:824
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:821
+#: camel/providers/smtp/camel-smtp-transport.c:843
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:846
+#: camel/providers/smtp/camel-smtp-transport.c:868
 #, 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:865
+#: camel/providers/smtp/camel-smtp-transport.c:887
 #, 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:896
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, 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:915
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:930
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:952
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:967
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:1013
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1010
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1033
+#: camel/providers/smtp/camel-smtp-transport.c:1055
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1052
+#: camel/providers/smtp/camel-smtp-transport.c:1074
 #, 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:95
 msgid "1 byte"
 msgstr "1 octet"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:97
 #, c-format
 msgid "%u bytes"
 msgstr "%u octets"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fko"
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fMo"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:112
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fGo"
 
 #. 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:332 mail/mail-display.c:120
 msgid "attachment"
 msgstr "pi�ce-jointe"
 
-#: composer/e-msg-composer-attachment-bar.c:413
+#: 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:461
+#: composer/e-msg-composer-attachment-bar.c:469
 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:492
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Add attachment..."
 msgstr "Ajouter une pi�ce-jointe..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:501
 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:1171
-#: ui/evolution-mail.xml.h:1
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
 msgid "Attachment"
 msgstr "Pi�ce-jointe"
 
@@ -4478,52 +4807,52 @@ msgstr "Type MIME :"
 msgid "Send as:"
 msgstr "Envoyer comme :"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:321
 msgid "Click here for the address book"
 msgstr "Cliquez ici pour le carnet d'adresses"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
 msgid "From:"
 msgstr "De :"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
 msgid "Reply-To:"
 msgstr "R�pondre-� :"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
 msgid "To:"
 msgstr "� :"
 
-#: composer/e-msg-composer-hdrs.c:377
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Enter the recipients of the message"
 msgstr "Entrez les destinataires du message"
 
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
 msgid "Cc:"
 msgstr "Cc :"
 
-#: composer/e-msg-composer-hdrs.c:381
+#: composer/e-msg-composer-hdrs.c:388
 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:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Bcc:"
 msgstr "Bcc :"
 
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:392
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4531,7 +4860,7 @@ 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:518
+#: composer/e-msg-composer.c:528
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4540,26 +4869,32 @@ msgstr ""
 "Ne peut ouvrir le fichier de signature %s :\n"
 "%s"
 
-#: composer/e-msg-composer.c:706
+#: composer/e-msg-composer.c:716
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: composer/e-msg-composer.c:717
+#: composer/e-msg-composer.c:727
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: composer/e-msg-composer.c:737
+#: composer/e-msg-composer.c:747
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erreur de chargement du fichier : %s"
 
-#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
+#: composer/e-msg-composer.c:819
+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:824
+#: composer/e-msg-composer.c:883
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4569,27 +4904,27 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
-#: composer/e-msg-composer.c:849
+#: composer/e-msg-composer.c:908
 msgid "Open file"
 msgstr "Ouvrir un fichier"
 
-#: composer/e-msg-composer.c:975
+#: composer/e-msg-composer.c:1034
 msgid "That file does not exist."
 msgstr "Ce fichier n'existe pas."
 
-#: composer/e-msg-composer.c:985
+#: 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:995
+#: 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:1005
+#: 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:1027
+#: composer/e-msg-composer.c:1086
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4597,25 +4932,25 @@ 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:1048
+#: 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:1349 composer/e-msg-composer.c:1681
+#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
 msgid "Compose a message"
 msgstr "Composer un message"
 
-#: composer/e-msg-composer.c:1765
+#: composer/e-msg-composer.c:1829
 msgid "Could not create composer window."
 msgstr "Ne peut cr�er la fen�tre de composition."
 
-#: composer/evolution-composer.c:352
+#: 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:367
+#: composer/evolution-composer.c:370
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
@@ -4635,55 +4970,81 @@ msgid "calendar information"
 msgstr "Information utilisateur"
 
 #. 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:69 e-util/e-time-utils.c:117
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
 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:86 e-util/e-time-utils.c:197
+#: 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:89 e-util/e-time-utils.c:200
+#: 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:93 e-util/e-time-utils.c:204
+#: 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:96 e-util/e-time-utils.c:207
+#: 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:267
-#: 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:269
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
 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:272
+#: e-util/e-time-utils.c:274
 #, 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:281
+#: e-util/e-time-utils.c:283
 #, 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 ""
@@ -4763,7 +5124,7 @@ msgstr "Va � la date actuelle"
 msgid "Configure %s"
 msgstr "_Configuration du dossier..."
 
-#: executive-summary/component/e-summary.c:918
+#: executive-summary/component/e-summary.c:924
 #, fuzzy, c-format
 msgid ""
 "Cannot open the HTML file:\n"
@@ -4772,14 +5133,14 @@ msgstr ""
 "Ne peut ouvrir le fichier %s :\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:932
+#: 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:950
+#: executive-summary/component/e-summary.c:956
 msgid "File does not have a place for the services.\n"
 msgstr ""
 
@@ -4791,7 +5152,7 @@ msgstr ""
 msgid "Background:"
 msgstr ""
 
-#: executive-summary/component/main.c:60
+#: 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"
@@ -4825,89 +5186,89 @@ msgstr ""
 msgid "Test service"
 msgstr "Ajouter un service"
 
-#: 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
+#: 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:765
+#: executive-summary/test-service/rdf-summary.c:768
 msgid "Update automatically"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:775
+#: executive-summary/test-service/rdf-summary.c:778
 #, fuzzy
 msgid "Update now"
 msgstr "Mettre � jour le calendrier"
 
-#: executive-summary/test-service/rdf-summary.c:785
+#: executive-summary/test-service/rdf-summary.c:788
 #, fuzzy
 msgid "Update every "
 msgstr "_Mettre � jour Libre/Occup�"
 
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
+#: executive-summary/test-service/rdf-summary.c:796
+#: filter/filter-datespec.c:83
 msgid "minutes"
 msgstr "minutes"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "year"
 msgstr "an"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "years"
 msgstr "ann�es"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "month"
 msgstr "mois"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "months"
 msgstr "mois"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "week"
 msgstr "semaine"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "weeks"
 msgstr "semaines"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:81
 msgid "days"
 msgstr "jours"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hour"
 msgstr "heure"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hours"
 msgstr "heures"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:83
 msgid "minute"
 msgstr "minute"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "second"
 msgstr "seconde"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "seconds"
 msgstr "secondes"
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:199
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Oups. Vous avez oubli� de choisir une date."
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:201
 msgid "Oops. You have chosen an invalid date."
 msgstr "Oups. Vous avez choisi une date invalide."
 
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:275
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -4916,7 +5277,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:282
+#: filter/filter-datespec.c:298
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -4924,7 +5285,7 @@ msgstr ""
 "La date du message sera compar� � la date\n"
 "que vous sp�cifiez ici."
 
-#: filter/filter-datespec.c:322
+#: filter/filter-datespec.c:338
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -4935,67 +5296,64 @@ msgstr ""
 "� il y a une semaine �, par exemple."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "the current time"
 msgstr "la date actuelle"
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "a time you specify"
 msgstr "une date que vous sp�cifiez"
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:374
 msgid "a time relative to the current time"
 msgstr "une date relative � la date en cours"
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:432
 msgid "Compare against"
 msgstr "Comparer avec"
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
 msgid "now"
 msgstr "maintenant"
 
-#: filter/filter-datespec.c:690
+#: filter/filter-datespec.c:706
 msgid "<click here to select a date>"
 msgstr "<cliquez ici pour s�lectionner une date>"
 
-#: filter/filter-editor.c:126 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "R�gles de Filtrage"
 
 #. and now for the action area
-#: filter/filter-filter.c:424
+#: filter/filter-filter.c:453
 msgid "Then"
 msgstr "Alors"
 
-#: filter/filter-filter.c:437
+#: filter/filter-filter.c:467
 msgid "Add action"
 msgstr "Ajouter l'action"
 
-#: filter/filter-filter.c:443
-msgid "Remove action"
-msgstr "Supprimer l'action"
-
-#: 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:279
+#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
+#: mail/mail-account-gui.c:682
 msgid "Select Folder"
 msgstr "S�lectionnez un Dossier"
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:247
 msgid "Enter folder URI"
 msgstr "Entrez l'URI du dossier"
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:293
 msgid "<click here to select a folder>"
 msgstr "<cliquez ici pour s�lectionner un dossier>"
 
-#: filter/filter-input.c:189
+#: filter/filter-input.c:194
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5004,56 +5362,38 @@ msgstr ""
 "Erreur durant le pr�paration vers %s :\n"
 "%s"
 
-#: filter/filter-part.c:467
+#: filter/filter-part.c:475
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:597
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Nom de la r�gle : "
 
-#: filter/filter-rule.c:601
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "SansTitre"
 
-#: filter/filter-rule.c:617
+#: filter/filter-rule.c:646
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:634
+#: filter/filter-rule.c:664
 msgid "Execute actions"
 msgstr "Ex�cuter les actions"
 
-#: filter/filter-rule.c:638
+#: filter/filter-rule.c:668
 msgid "if all criteria are met"
 msgstr "si tous les crit�res sont remplis"
 
-#: filter/filter-rule.c:643
+#: filter/filter-rule.c:673
 msgid "if any criteria are met"
 msgstr "si un des crit�res est rempli"
 
-#: filter/filter-rule.c:654
+#: filter/filter-rule.c:684
 msgid "Add criterion"
 msgstr "Ajouter un crit�re"
 
-#: filter/filter-rule.c:660
-msgid "Remove criterion"
-msgstr "Supprimer le crit�re"
-
-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr "R�pondu �"
-
-#. { N_("Deleted"), "Deleted" },
-#. { N_("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr "Important"
-
-#: filter/filter-system-flag.c:71
-msgid "Read"
-msgstr "Lu"
-
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "�diter les Filtres"
@@ -5070,7 +5410,7 @@ msgstr "Entrant"
 msgid "Outgoing"
 msgstr "Sortant"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Dossiers Virtuels"
 
@@ -5096,283 +5436,319 @@ msgstr ""
 msgid "with all local folders"
 msgstr "Enregistre le dossier local"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Assigner une couleur"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Assigner un score"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 #, fuzzy
 msgid "Attachments"
 msgstr "Pi�ce-jointe"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contient"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Copier vers le dossier"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Date de r�ception"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Date d'envoi"
 
-#: filter/libfilter-i18n.h:12
-msgid "does not contain"
-msgstr "ne contient pas"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not end with"
-msgstr "ne fini pas avec"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not exist"
-msgstr "n'existe pas"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not sound like"
-msgstr "ne ressemble pas"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not start with"
-msgstr "ne commence pas par"
+#: filter/libfilter-i18n.h:9
+msgid "Deleted"
+msgstr "Supprim�"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:10
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "n'existe pas"
 
-#: filter/libfilter-i18n.h:18
-msgid "ends with"
-msgstr "fini avec"
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Draft"
+msgstr "Date"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Exist"
 msgstr "Quitter"
 
-#: filter/libfilter-i18n.h:20
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Expression"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Forward to Address"
 msgstr "Fait suivre � l'adresse"
 
-#: filter/libfilter-i18n.h:23
-msgid "is"
-msgstr "est"
-
-#: filter/libfilter-i18n.h:24
-msgid "is greater than"
-msgstr "est plus que"
-
-#: filter/libfilter-i18n.h:25
-msgid "is less than"
-msgstr "est moins que"
+#: filter/libfilter-i18n.h:15
+msgid "Important"
+msgstr "Important"
 
-#: filter/libfilter-i18n.h:26
-msgid "is not"
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "Is Not"
 msgstr "n'est pas"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Is"
+msgstr "Si"
+
+#: filter/libfilter-i18n.h:18
 #, fuzzy
 msgid "Mailing list"
 msgstr "liste de diffusion %s"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:19
 msgid "Message Body"
 msgstr "Corps du message"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:20
 msgid "Message Header"
 msgstr "En-t�te du message"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:21
 msgid "Message was received"
 msgstr "Le message a �t� re�u"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:22
 msgid "Message was sent"
 msgstr "Le message a �t� envoy�"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:23
 msgid "Move to Folder"
 msgstr "D�placer vers le dossier"
 
-#: filter/libfilter-i18n.h:33
-msgid "on or after"
-msgstr "sur ou apr�s"
-
-#: filter/libfilter-i18n.h:34
-msgid "on or before"
-msgstr "sur ou avant"
+#: filter/libfilter-i18n.h:24
+msgid "Read"
+msgstr "Lu"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:25
 msgid "Recipients"
 msgstr "Destinataires"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:26
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1171
+#: filter/libfilter-i18n.h:27
+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
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:29
+msgid "Sender"
+msgstr "Exp�diteur"
+
+#: filter/libfilter-i18n.h:30
 msgid "Set Status"
 msgstr "D�finir l'�tat"
 
-#: filter/libfilter-i18n.h:40
-msgid "sounds like"
-msgstr "ressemble �"
-
-#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
-msgid "Source"
-msgstr "Source"
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "Source Account"
+msgstr "Compte"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:32
 msgid "Specific header"
 msgstr "En-t�te sp�cifique"
 
-#: filter/libfilter-i18n.h:43
-msgid "starts with"
-msgstr "D�bute avec"
-
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:34
 msgid "Stop Processing"
 msgstr "Arr�te le traitement"
 
-#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
+#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
 msgid "Subject"
 msgstr "Sujet"
 
+#: filter/libfilter-i18n.h:38
+msgid "contains"
+msgstr "contient"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not contain"
+msgstr "ne contient pas"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not end with"
+msgstr "ne fini pas avec"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not exist"
+msgstr "n'existe pas"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not sound like"
+msgstr "ne ressemble pas"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not start with"
+msgstr "ne commence pas par"
+
+#: filter/libfilter-i18n.h:44
+msgid "ends with"
+msgstr "fini avec"
+
+#: filter/libfilter-i18n.h:45
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:46
+msgid "is greater than"
+msgstr "est plus que"
+
 #: filter/libfilter-i18n.h:47
+msgid "is less than"
+msgstr "est moins que"
+
+#: filter/libfilter-i18n.h:48
+msgid "is not"
+msgstr "n'est pas"
+
+#: filter/libfilter-i18n.h:49
+msgid "is"
+msgstr "est"
+
+#: filter/libfilter-i18n.h:50
+msgid "on or after"
+msgstr "sur ou apr�s"
+
+#: filter/libfilter-i18n.h:51
+msgid "on or before"
+msgstr "sur ou avant"
+
+#: filter/libfilter-i18n.h:52
+msgid "sounds like"
+msgstr "ressemble �"
+
+#: filter/libfilter-i18n.h:53
+msgid "starts with"
+msgstr "D�bute avec"
+
+#: filter/libfilter-i18n.h:54
 msgid "was after"
 msgstr "�tait apr�s"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:55
 msgid "was before"
 msgstr "�tait avant"
 
-#: filter/score-editor.c:126
+#: filter/score-editor.c:130
 #, fuzzy
 msgid "Score Rules"
 msgstr "�diter la r�gle de score"
 
-#: mail/component-factory.c:306
+#: mail/component-factory.c:329
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
-#: mail/component-factory.c:379
+#: mail/component-factory.c:402
 msgid "Cannot register storage with shell"
 msgstr "Ne peut enregistrer le stockage avec le shell"
 
-#: mail/folder-browser-factory.c:237
+#: mail/folder-browser-factory.c:209
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propri�t�s"
 
-#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "Propri�t�s"
 
-#: mail/folder-browser.c:219
+#: mail/folder-browser.c:225
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "S�lectionnez un Dossier"
 
-#: mail/folder-browser.c:509
+#: mail/folder-browser.c:533
 msgid "VFolder on Subject"
 msgstr "Dossier virtuel sur le sujet"
 
-#: mail/folder-browser.c:512
+#: mail/folder-browser.c:536
 msgid "VFolder on Sender"
 msgstr "Dossier virtuel sur l'exp�diteur"
 
-#: mail/folder-browser.c:515
+#: mail/folder-browser.c:539
 msgid "VFolder on Recipients"
 msgstr "Dossier virtuel sur les destinataires"
 
-#: mail/folder-browser.c:518 mail/folder-browser.c:702
+#: mail/folder-browser.c:542 mail/folder-browser.c:733
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:524
+#: mail/folder-browser.c:548
 msgid "Filter on Subject"
 msgstr "Filtre sur le sujet"
 
-#: mail/folder-browser.c:527
+#: mail/folder-browser.c:551
 msgid "Filter on Sender"
 msgstr "Filtre sur l'exp�diteur"
 
-#: mail/folder-browser.c:530
+#: mail/folder-browser.c:554
 msgid "Filter on Recipients"
 msgstr "Filtre sur les destinataires"
 
-#: mail/folder-browser.c:533 mail/folder-browser.c:701
+#: mail/folder-browser.c:557 mail/folder-browser.c:732
 msgid "Filter on Mailing List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:544
+#: mail/folder-browser.c:568
+#, fuzzy
+msgid "Resend"
+msgstr "seconde"
+
+#: mail/folder-browser.c:570
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: mail/folder-browser.c:546 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Imprimer"
-
-#: mail/folder-browser.c:551
+#: mail/folder-browser.c:577
 msgid "Reply to Sender"
 msgstr "R�pondre � l'exp�diteur"
 
-#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
+#: 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:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
+#: 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:557
+#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
 msgid "Forward inline"
 msgstr "Faire suire incorpor�"
 
-#: mail/folder-browser.c:560
+#: mail/folder-browser.c:586
 msgid "Mark as Read"
 msgstr "Marquer comme lu"
 
-#: mail/folder-browser.c:562
+#: mail/folder-browser.c:588
 msgid "Mark as Unread"
 msgstr "Marquer comme non lu"
 
-#: mail/folder-browser.c:567
+#: mail/folder-browser.c:593
 msgid "Move to Folder..."
 msgstr "D�placer vers le dossier..."
 
-#: mail/folder-browser.c:569
+#: mail/folder-browser.c:595
 msgid "Copy to Folder..."
 msgstr "Copier vers le dossier..."
 
-#: mail/folder-browser.c:573
+#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
 msgid "Undelete"
 msgstr "R�cup�rer"
 
@@ -5380,20 +5756,20 @@ msgstr "R�cup�rer"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:583
+#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
 msgid "Apply Filters"
 msgstr "Appliquer les filtres"
 
-#: mail/folder-browser.c:587
+#: mail/folder-browser.c:613
 msgid "Create Rule From Message"
 msgstr "Cr�er une r�gle � partir du message"
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:735
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtre sur la liste de diffusion (%s)"
 
-#: mail/folder-browser.c:705
+#: mail/folder-browser.c:736
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Filtre sur la liste de diffusion (%s)"
@@ -5469,67 +5845,69 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-accounts.c:116
+#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
 msgid " (default)"
 msgstr " (d�faut)"
 
-#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#: mail/mail-accounts.c:197
+#, fuzzy
+msgid "Disable"
+msgstr "D�sactiver."
+
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+msgid "Enable"
+msgstr ""
+
+#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
 #, 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:334 mail/mail-accounts.c:338
+#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
 #, 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:423
+#: mail/mail-accounts.c:536
 msgid "Evolution Account Manager"
 msgstr "Gestionnaire de comptes Evolution"
 
-#: mail/mail-account-editor.c:307
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
+#: 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:706
+#: mail/mail-account-editor.c:173
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Conduit '� faire' d'Evolution"
 
-#: mail/mail-account-editor.c:727
-#, fuzzy
-msgid "Unspecified"
-msgstr "Ind�fini"
-
-#: mail/mail-autofilter.c:71
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Courrier � %s"
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, c-format
 msgid "Subject is %s"
 msgstr "Sujet est %s"
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr "Courrier de %s"
 
-#: mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr "liste de diffusion %s"
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
 msgid "Add Filter Rule"
 msgstr "Ajouter une R�gle de Filtre"
 
-#: mail/mail-callbacks.c:85
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5541,7 +5919,7 @@ msgstr ""
 "recevoir ou composer des courriers.\n"
 "Voulez-vous le configurer maintenant ?"
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5549,7 +5927,7 @@ msgstr ""
 "Vous devez configurer une identit�\n"
 "avant de pouvoir composer un message."
 
-#: mail/mail-callbacks.c:150
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5557,11 +5935,11 @@ msgstr ""
 "Vous devez configurez un transport de messagerie\n"
 "avant de pouvoir composer un message."
 
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:202
 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:227
+#: mail/mail-callbacks.c:235
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5569,33 +5947,33 @@ msgstr ""
 "Ce message n'a pas de sujet.\n"
 "Voulez-vous vraiment l'envoyer ?"
 
-#: mail/mail-callbacks.c:294
-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:316
+#: mail/mail-callbacks.c:308
 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:579
+#: mail/mail-callbacks.c:351
+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"
 msgstr "Le %s, %s a �crit :\n"
 
-#: mail/mail-callbacks.c:761
+#: mail/mail-callbacks.c:773
 msgid "Forwarded message:\n"
 msgstr "Message suivi :\n"
 
-#: mail/mail-callbacks.c:864
+#: mail/mail-callbacks.c:876
 msgid "Move message(s) to"
 msgstr "D�placez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:866
+#: mail/mail-callbacks.c:878
 msgid "Copy message(s) to"
 msgstr "Copiez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:1007
+#: mail/mail-callbacks.c:1019
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5603,11 +5981,20 @@ msgstr ""
 "Vous ne pouvez �diter des messages que\n"
 "lorsqu'ils sont dans le dossier Brouillons."
 
-#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1056
+#, fuzzy
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+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:1044 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5615,15 +6002,15 @@ msgstr ""
 "Un fichier avec le m�me nom existe.\n"
 "L'�craser ?"
 
-#: mail/mail-callbacks.c:1088
+#: mail/mail-callbacks.c:1137
 msgid "Save Message As..."
 msgstr "Enregistrer le message sous..."
 
-#: mail/mail-callbacks.c:1090
+#: mail/mail-callbacks.c:1139
 msgid "Save Messages As..."
 msgstr "Enregistrer les messages sous..."
 
-#: mail/mail-callbacks.c:1204
+#: mail/mail-callbacks.c:1253
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5632,46 +6019,59 @@ msgstr ""
 "Erreur de chargement des information du filtre :\n"
 "%s"
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1349
 msgid "Printing of message failed"
 msgstr "�chec de l'impression du message"
 
+#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#, fuzzy
+msgid "Connecting to server..."
+msgstr "Connexion au serveur"
+
 #: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " Check for supported types "
+msgstr "D�tecter les types support�s..."
+
+#: mail/mail-config.glade.h:2
+#, fuzzy
+msgid " color"
+msgstr "Couleurs"
+
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "Compte"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "Information du compte"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "Gestionnaire de comptes"
 
-#: mail/mail-config.glade.h:5
-msgid "Advanced"
-msgstr "Avanc�e"
-
 #: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "Accounts"
+msgstr "Compte"
+
+#: mail/mail-config.glade.h:8
 msgid "Authentication"
 msgstr "Identification"
 
-#: mail/mail-config.glade.h:7
-msgid "Authentication Type:"
+#: mail/mail-config.glade.h:9
+#, fuzzy
+msgid "Authentication Type: "
 msgstr "Type d'identification :"
 
-#: mail/mail-config.glade.h:9
-msgid "Automatically check mail every"
+#: mail/mail-config.glade.h:10
+msgid "Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Check settings"
-msgstr "V�rifier les r�glages"
-
 #: mail/mail-config.glade.h:12
 #, fuzzy
 msgid ""
@@ -5685,209 +6085,184 @@ 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:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "De_fault"
 msgstr "D�faut"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Done"
 msgstr "Fait"
 
-#: mail/mail-config.glade.h:23
-msgid "Email Address:"
-msgstr "Adresse �lectronique :"
+#: mail/mail-config.glade.h:21
+#, fuzzy
+msgid "Drafts"
+msgstr "Date"
+
+#: mail/mail-config.glade.h:22
+#, fuzzy
+msgid "Drafts folder:"
+msgstr "Cr�ation d'un nouveau dossier"
 
 #: mail/mail-config.glade.h:24
-msgid "Email address:"
+msgid "Email Address:"
 msgstr "Adresse �lectronique :"
 
-#: mail/mail-config.glade.h:25
-msgid "Evolution Mail Configuration"
-msgstr "Configuration de la messagerie Evolution"
-
 #: mail/mail-config.glade.h:26
 msgid "Full Name:"
 msgstr "Nom complet :"
 
-#: mail/mail-config.glade.h:29
-msgid "Hostname:"
-msgstr "Nom d'h�te :"
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "Highlight citations with "
+msgstr "Mettre en �vidence les �l�ments s'achevant aujourd'hui"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
-msgid "IMAP"
+msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Identity"
 msgstr "Identit�"
 
-#: mail/mail-config.glade.h:32
-msgid "Include this account when receiving mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:33
-msgid "Keep mail on server"
-msgstr "Garder les courriers sur le serveur"
-
-#: mail/mail-config.glade.h:34
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:35
-msgid "Mail"
-msgstr "Courrier"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail Account"
-msgstr "Compte de messagerie"
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Kerberos "
+msgstr "Kerberos 4"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:32
 msgid "Mail Configuration"
 msgstr "Configuration de la messagerie"
 
-#: mail/mail-config.glade.h:38
-msgid "Mail Configuration Druid"
-msgstr "Assistant de configuration de messagerie"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid "Mark messages as \"Read\" after:"
 msgstr "Marque les messages comme vus [ms] : "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:36
 msgid "News"
 msgstr "Nouvelles"
 
-#: mail/mail-config.glade.h:44
-msgid "Optional"
-msgstr "Optionnel"
+#: mail/mail-config.glade.h:38
+#, fuzzy
+msgid "Optional Information"
+msgstr "Pas d'information"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:39
 msgid "Organization:"
 msgstr "Organisation :"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "PGP binary path:"
 msgstr "Encrypter avec PGP"
 
-#: mail/mail-config.glade.h:48
-msgid "Password:"
-msgstr "Mot de passe :"
-
-#: mail/mail-config.glade.h:50
-msgid "Plain Text"
-msgstr "Texte plein"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Qmail maildir "
+msgstr "maildir"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:47
 msgid "Receiving Email"
 msgstr "R�ception des messages"
 
-#: mail/mail-config.glade.h:52
-msgid "Remember my password"
-msgstr "Se souvenir de mon mot de passe"
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "R�ception des messages"
+
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Receiving Options"
+msgstr "R�ception des messages"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Required Information"
+msgstr "Information utilisateur"
 
 #: mail/mail-config.glade.h:53
 #, fuzzy
-msgid "Reply address:"
-msgstr "Adresse �lectronique :"
+msgid "Select PGP binary"
+msgstr "S�lectionner un fichier"
 
 #: mail/mail-config.glade.h:54
-msgid "Required"
-msgstr "Requis"
+#, fuzzy
+msgid "Send mail in HTML format by default."
+msgstr "Envoie le message au format HTML"
 
-#: mail/mail-config.glade.h:56
-msgid "Save password"
-msgstr "Enregistrer le mot de passe"
+#: mail/mail-config.glade.h:55
+msgid "Sending Email"
+msgstr "Envoie du message"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
-msgid "Select PGP binary"
-msgstr "S�lectionner un fichier"
+msgid "Sending Mail"
+msgstr "Envoie du message"
 
 #: mail/mail-config.glade.h:58
-msgid "Select signature file"
-msgstr "S�lectionner un fichier de signature"
+#, fuzzy
+msgid "Sent"
+msgstr "Vu"
 
 #: mail/mail-config.glade.h:59
 #, fuzzy
-msgid "Send mail in HTML format by default."
-msgstr "Envoie le message au format HTML"
+msgid "Sent and Draft Messages"
+msgstr "Calendrier"
 
 #: mail/mail-config.glade.h:60
-msgid "Sending Email"
-msgstr "Envoie du message"
+#, fuzzy
+msgid "Sent messages folder:"
+msgstr "Joints les messages du dossier \"%s\""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:61
 msgid "Server Configuration"
 msgstr "Configuration du serveur"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:62
 msgid "Server Type: "
 msgstr "Type de serveur : "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Server requires authentication"
 msgstr "Le serveur n�cessite une identification"
 
-#: mail/mail-config.glade.h:65
-#, fuzzy
-msgid "Server type:"
-msgstr "Type de serveur : "
-
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Signature file:"
 msgstr "Fichier de signature :"
 
-#: mail/mail-config.glade.h:67
-msgid "Signature:"
-msgstr "Signature :"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:65
 msgid "Sources"
 msgstr "Sources"
 
-#: mail/mail-config.glade.h:70
-msgid "This server requires a secure connection (SSL)"
-msgstr "Ce serveur n�cessite une connexion s�curis� (SSL)"
-
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:66
 #, fuzzy
-msgid "Transport"
-msgstr "Transparent"
+msgid "Special Folders"
+msgstr "Dossiers Virtuels"
 
-#: mail/mail-config.glade.h:72
-#, fuzzy
-msgid "Transport Authentication"
-msgstr "Identification"
+#: mail/mail-config.glade.h:67
+msgid "Standard Unix mbox"
+msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:68
 msgid "Type"
 msgstr "Type"
 
-#: mail/mail-config.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Tapez le nom sous lequel vous voulez identifier ces serveurs. Par exemple : "
-"� Travail � ou � Maison �."
-
-#: mail/mail-config.glade.h:75
-msgid "User Information"
-msgstr "Information utilisateur"
+#: mail/mail-config.glade.h:69
+#, fuzzy
+msgid "Use secure connection (SSL)"
+msgstr "Ce serveur n�cessite une connexion s�curis� (SSL)"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:70
 msgid "Username:"
 msgstr "Nom d'utilisateur :"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
@@ -5895,172 +6270,201 @@ msgid ""
 "Click \"Next\" to begin. "
 msgstr "Configuration de la messagerie Evolution"
 
-#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: 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:28
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
 msgid "_Edit"
 msgstr "_�dition"
 
-#: mail/mail-config.glade.h:83
-msgid "minutes."
-msgstr "minutes."
+#: 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:421
-#, c-format
+#: mail/mail-config-druid.c:101
 msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+"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:515
-msgid "Namespace:"
-msgstr "Espace de nom :"
+#: 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:708
-#, c-format
+#: mail/mail-config-druid.c:107
 msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+"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:1215
+#: mail/mail-config-druid.c:445
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-display.c:189
+#: mail/mail-display.c:194
 msgid "Save Attachment"
 msgstr "Enregistrer la pi�ce-jointe"
 
-#: mail/mail-display.c:229
+#: 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:290
+#: mail/mail-display.c:295
 msgid "Save to Disk..."
 msgstr "Enregistrer sur le disque..."
 
-#: mail/mail-display.c:292
+#: mail/mail-display.c:297
 #, c-format
 msgid "Open in %s..."
 msgstr "Ouvrir dans %s..."
 
-#: mail/mail-display.c:294
+#: mail/mail-display.c:299
 msgid "View Inline"
 msgstr "Voir en ligne"
 
-#: mail/mail-display.c:323
+#: mail/mail-display.c:334
 msgid "External Viewer"
 msgstr "Visualiseur externe"
 
-#: mail/mail-display.c:346
+#: mail/mail-display.c:357
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Voir en ligne (via %s)"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:361
 msgid "Hide"
 msgstr "Cacher"
 
-#: mail/mail-format.c:506
+#: mail/mail-display.c:1102
+#, fuzzy
+msgid "Open link in browser"
+msgstr "Ouvrir dans une nouvelle fen�tre"
+
+#: mail/mail-display.c:1104
+#, fuzzy
+msgid "Save as (FIXME)"
+msgstr "_T�che (FIXME)"
+
+#: mail/mail-display.c:1106
+#, fuzzy
+msgid "Copy location (FIXME)"
+msgstr "_Contact (FIXME)"
+
+#: mail/mail-format.c:518
 #, c-format
 msgid "%s attachment"
 msgstr "pi�ce-jointe %s"
 
-#: mail/mail-format.c:704
+#: mail/mail-format.c:560
+#, 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
 #, fuzzy
 msgid "Loading message content"
 msgstr "Contenu de message invalide"
 
-#: mail/mail-format.c:993
+#: mail/mail-format.c:1046
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Nettoyer l'affichage des messages"
 
-#: mail/mail-format.c:999
+#: mail/mail-format.c:1052
 #, fuzzy
 msgid "Encrypted message"
 msgstr "�diter le message"
 
-#: mail/mail-format.c:1000
+#: mail/mail-format.c:1053
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1069 mail/mail-format.c:1456
+#: mail/mail-format.c:1137 mail/mail-format.c:1526
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1077 mail/mail-format.c:1464
+#: mail/mail-format.c:1145 mail/mail-format.c:1534
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1677
+#: mail/mail-format.c:1747
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1689
+#: mail/mail-format.c:1759
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1693
+#: mail/mail-format.c:1763
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sur la liste de diffusion (%s)"
 
-#: mail/mail-format.c:1727
+#: mail/mail-format.c:1797
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1732
+#: mail/mail-format.c:1802
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:335
+#: mail/mail-local.c:337
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Aucun dossier � %s �."
 
-#: mail/mail-local.c:508
+#: mail/mail-local.c:509
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "Ouvrir dans %s..."
 
-#: mail/mail-local.c:786
+#: mail/mail-local.c:787
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Changement du dossier � %s � vers le format � %s �"
 
-#: mail/mail-local.c:790
+#: 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:814
+#: mail/mail-local.c:815
 msgid "Reconfiguring folder"
 msgstr "Reconfiguration du dossier"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:843
+#: mail/mail-local.c:844
 msgid "Closing current folder"
 msgstr "Fermeture du dossier en cours"
 
-#: mail/mail-local.c:875
+#: mail/mail-local.c:876
 msgid "Renaming old folder and opening"
 msgstr "Renommage du vieus dossier et ouverture"
 
-#: mail/mail-local.c:893
+#: mail/mail-local.c:894
 msgid "Creating new folder"
 msgstr "Cr�ation d'un nouveau dossier"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:908
 msgid "Copying messages"
 msgstr "Copie du message"
 
-#: mail/mail-local.c:928
+#: mail/mail-local.c:925
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6069,7 +6473,7 @@ msgstr ""
 "Ne peut enregistrer les meta-info du dossier; vous n'allez probablement plus "
 "pouvoir ouvrir ce dossier : %s"
 
-#: mail/mail-local.c:967
+#: mail/mail-local.c:964
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6077,7 +6481,7 @@ 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:177
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6086,7 +6490,7 @@ msgstr ""
 "Erreur durant � %s � :\n"
 "%s"
 
-#: mail/mail-mt.c:179
+#: mail/mail-mt.c:192
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6095,98 +6499,107 @@ msgstr ""
 "Erreur durant l'ex�cution de l'op�ration :\n"
 "%s"
 
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
+#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
 msgid "Working"
 msgstr "Travail en cours"
 
-#: mail/mail-mt.c:666 mail/session.c:91
+#: mail/mail-mt.c:679 mail/session.c:98
 msgid "Do you accept?"
 msgstr ""
 
-#: mail/mail-mt.c:860
+#: mail/mail-mt.c:873
 #, fuzzy
 msgid "Evolution progress"
 msgstr "Evolution"
 
-#: mail/mail-ops.c:516
+#: mail/mail-ops.c:587
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Exp�dition de � %s �"
 
-#: mail/mail-ops.c:518
+#: mail/mail-ops.c:589
 msgid "Sending message"
 msgstr "Envoie du message"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:704
+#, fuzzy, c-format
+msgid "Sending message %d of %d"
+msgstr "�criture du message %d du %d"
+
+#: mail/mail-ops.c:723
+#, 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
+msgid "Complete."
+msgstr "Compl�t�."
+
+#: mail/mail-ops.c:811
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Joints les messages du dossier \"%s\""
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "D�placez le(s) message(s) vers"
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Copie du message"
 
-#: mail/mail-ops.c:842
+#: mail/mail-ops.c:900
 msgid "Moving"
 msgstr "D�placement"
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:903
 msgid "Copying"
 msgstr "Duplication"
 
-#: mail/mail-ops.c:856
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s message %d de %d (uid � %s �)"
-
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:978
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scrutation des dossiers dans � %s �"
 
-#: mail/mail-ops.c:1085
+#: mail/mail-ops.c:1139
 msgid "Forwarded messages"
 msgstr "Messages suivis"
 
-#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
+#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ouverture du dossier %s"
 
-#: mail/mail-ops.c:1193
+#: mail/mail-ops.c:1247
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Ouverture du dossier %s"
 
-#: mail/mail-ops.c:1380
+#: mail/mail-ops.c:1434
 msgid "Expunging folder"
 msgstr "Nettoyage du dossier"
 
-#: mail/mail-ops.c:1429
+#: mail/mail-ops.c:1483
 #, c-format
 msgid "Retrieving message %s"
 msgstr "R�cup�ration du message %s"
 
-#: mail/mail-ops.c:1496
+#: mail/mail-ops.c:1550
 msgid "Retrieving messages"
 msgstr "R�cup�ration des messages"
 
-#: mail/mail-ops.c:1506
+#: 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:1580
+#: mail/mail-ops.c:1634
 msgid "Saving messages"
 msgstr "Enregistre les messages"
 
-#: mail/mail-ops.c:1659
+#: mail/mail-ops.c:1713
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6195,12 +6608,12 @@ msgstr ""
 "Ne peut cr�er le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:1672
+#: 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:1686
+#: mail/mail-ops.c:1740
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6209,12 +6622,12 @@ msgstr ""
 "Erreur lors de l'enregistrement des messages vers : %s :\n"
 " %s"
 
-#: mail/mail-ops.c:1760
+#: mail/mail-ops.c:1814
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Enregistrer la pi�ce-jointe"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1829
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6223,265 +6636,237 @@ msgstr ""
 "Ne peut cr�er le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1857
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ne peut �crire les donn�es : %s"
 
-#: mail/mail-search-dialogue.c:107
+#: mail/mail-search-dialogue.c:113
 #, fuzzy
 msgid "_Search"
 msgstr "Rechercher"
 
-#: mail/mail-send-recv.c:136
+#: mail/mail-send-recv.c:138
 msgid "Cancelling ..."
 msgstr ""
 
-#: mail/mail-send-recv.c:231
+#: mail/mail-send-recv.c:233
 #, fuzzy
 msgid "Send & Receive mail"
 msgstr "R�ception des messages"
 
-#: mail/mail-send-recv.c:234
+#: mail/mail-send-recv.c:236
 #, fuzzy
 msgid "Receiving"
 msgstr "R�ception des messages"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:285
 msgid "Updating ..."
 msgstr ""
 
-#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+#: 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:306
 #, fuzzy
 msgid "Sending"
 msgstr "Exp�dition de � %s �"
 
-#: mail/mail-send-recv.c:469
+#: mail/mail-send-recv.c:471
 msgid "Cancelled."
 msgstr "Annul�."
 
-#: mail/mail-send-recv.c:473
-msgid "Complete."
-msgstr "Compl�t�."
-
-#: mail/mail-summary.c:111
+#: mail/mail-summary.c:109
 msgid "Incomplete message written on pipe!"
 msgstr "Message incompl� �crit dans le conduit !"
 
-#: mail/mail-tools.c:138
+#: mail/mail-tools.c:141
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Ne peut cr�er de mbox temporaire � %s � : %s"
 
-#: mail/mail-tools.c:185
+#: mail/mail-tools.c:188
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (message suivi)"
 
-#: mail/mail-tools.c:195
+#: mail/mail-tools.c:198
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (pas de sujet)"
 
-#: mail/mail-tools.c:212
+#: mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Message suivi - %s"
 
-#: mail/mail-tools.c:214
+#: mail/mail-tools.c:217
 msgid "Forwarded message (no subject)"
 msgstr "Message suivi (pas de sujet)"
 
-#: mail/mail-tools.c:411
+#: 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-vfolder.c:248
+#: mail/mail-vfolder.c:249
 msgid "VFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:427
 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:138 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
 msgid "Reply"
 msgstr "R�pondre"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: 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:141 ui/evolution-mail.xml.h:41
+#: 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:144 ui/evolution-mail.xml.h:17
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
 msgid "Forward this message"
 msgstr "Fait suivre le message"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
+#: 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:150 ui/evolution-mail.xml.h:8
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Supprime le message"
 
-#: mail/message-list.c:618
+#: mail/message-list.c:648
 msgid "Unseen"
 msgstr "Non vu"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:649
 msgid "Seen"
 msgstr "Vu"
 
-#: mail/message-list.c:624
+#: mail/message-list.c:650
 msgid "Answered"
 msgstr "R�pondu"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:651
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:630
+#: mail/message-list.c:652
 msgid "Multiple Messages"
 msgstr "Messages multiple"
 
-#: mail/message-list.c:952
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
+#: mail/message-list.c:656
+#, fuzzy
+msgid "Lowest"
+msgstr "Basse"
 
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:964 mail/message-list.c:980
-#, c-format
-msgid "%s, et al."
-msgstr "%s, et tous"
+#: mail/message-list.c:657
+#, fuzzy
+msgid "Lower"
+msgstr "Basse"
 
-#: mail/message-list.c:967 mail/message-list.c:983
-msgid "<unknown>"
-msgstr "<inconnu>"
+#: mail/message-list.c:661
+#, fuzzy
+msgid "Higher"
+msgstr "Haute"
 
-#: mail/message-list.c:1035
+#: mail/message-list.c:662
+#, fuzzy
+msgid "Highest"
+msgstr "Haute"
+
+#: mail/message-list.c:912
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1042
+#: mail/message-list.c:919
 msgid "Today %l:%M %p"
 msgstr "Aujourd'hui %l:%M %p"
 
-#: mail/message-list.c:1051
+#: mail/message-list.c:928
 msgid "Yesterday %l:%M %p"
 msgstr "Hier %l:%M %p"
 
-#: mail/message-list.c:1063
+#: mail/message-list.c:940
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1071
+#: mail/message-list.c:948
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1073
+#: mail/message-list.c:950
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1171
+#: mail/message-list.c:1052
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 msgid "From"
 msgstr "De"
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 msgid "Date"
 msgstr "Date"
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 msgid "Received"
 msgstr "R��u"
 
-#: mail/message-list.c:1173
+#: mail/message-list.c:1054
 msgid "To"
 msgstr "�"
 
-#: mail/message-list.c:1173
+#: mail/message-list.c:1054
 msgid "Size"
 msgstr "Taille"
 
-#: mail/openpgp-utils.c:89
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Veuillez saisir votre %s phrase de passe pour %s"
-
-#: mail/openpgp-utils.c:92
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Veuillez saisir votre %s phrase de passe"
-
-#: 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 "Aucun programme GPG/PGP disponible."
-
-#: 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 "Aucun mot de passe fournit."
-
-#: 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"
-msgstr "Ne peut cr�er le tube vers GPG/PGP : %s"
-
-#: mail/openpgp-utils.c:588
-msgid "No recipients specified"
-msgstr "Aucun destinataires sp�cifi�s"
-
-#: mail/openpgp-utils.c:1088
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Ne peut cr�er de fichier temporaire : %s"
-
-#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
 msgid "Folder"
 msgstr "Dossier"
 
-#: mail/subscribe-dialog.c:65
+#: mail/subscribe-dialog.c:77
 #, fuzzy
 msgid "Store"
 msgstr "Score"
 
-#: mail/subscribe-dialog.c:147
+#: mail/subscribe-dialog.c:138
 msgid "Display folders starting with:"
 msgstr "Afficher les dossiers commen�ant avec :"
 
-#: mail/subscribe-dialog.c:177
+#: mail/subscribe-dialog.c:168
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:280
+#: mail/subscribe-dialog.c:271
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonnement au dossier � %s �"
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:273
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "D�sabonnement au dossier � %s �"
 
+#. Construct the app
+#: mail/subscribe-dialog.c:873
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "G�rer les abonnements..."
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #, fuzzy
 msgid "Folder name:"
@@ -6497,9 +6882,18 @@ msgstr "Type de fichier :"
 msgid "Specify where to create the folder:"
 msgstr "Pas suffisemment d'espace pour cr�er le dossier"
 
+#: 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:157
+#: shell/importer/importer.c:182
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6507,72 +6901,68 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/importer/importer.c:175 shell/importer/importer.c:202
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/importer/importer.c:309
+#: 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."
 
-#: shell/importer/importer.c:319
+#: shell/importer/importer.c:351
 msgid "Importing"
 msgstr "Importation"
 
-#: shell/importer/importer.c:327
+#: shell/importer/importer.c:359
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/importer/importer.c:342
+#: shell/importer/importer.c:372
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "Erreur de chargement %s"
+
+#: shell/importer/importer.c:387
 #, c-format
 msgid "Error loading %s"
 msgstr "Erreur de chargement %s"
 
-#: shell/importer/importer.c:357
+#: shell/importer/importer.c:402
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/importer/importer.c:428
+#: shell/importer/importer.c:473
 msgid "Automatic"
 msgstr "Automatique"
 
-#: shell/importer/importer.c:478
+#: shell/importer/importer.c:523
 msgid "Filename:"
 msgstr "Nom du fichier :"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
 msgid "Select a file"
 msgstr "S�lectionner un fichier"
 
-#: shell/importer/importer.c:493
+#: shell/importer/importer.c:538
 msgid "File type:"
 msgstr "Type de fichier :"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
 msgid "Import"
 msgstr "Importer"
 
-#: 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."
-msgstr ""
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -6593,11 +6983,11 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: shell/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr "Installation d'Evolution"
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:122
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6605,32 +6995,32 @@ 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:117
+#: shell/e-setup.c:123
 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:157
+#: shell/e-setup.c:163
 msgid "Could not update files correctly"
 msgstr "Ne peut mettre � jour les fichiers correctement"
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
+#: 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:189
+#: shell/e-setup.c:195
 #, 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:190
+#: shell/e-setup.c:196
 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:209
+#: shell/e-setup.c:215
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6641,7 +7031,7 @@ msgstr ""
 "%s\n"
 "Erreur : %s"
 
-#: shell/e-setup.c:224
+#: shell/e-setup.c:230
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -6650,7 +7040,7 @@ msgstr ""
 "Ne peut copier les fichiers dans\n"
 "� %s �."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:255
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6661,7 +7051,7 @@ msgstr ""
 "D�placez le afin de permettre l'installation\n"
 "des fichiers utilisateur d'Evolution."
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:267
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6672,7 +7062,7 @@ msgstr ""
 "d'Evolution. D�placez le afin de permettre\n"
 "l'installation des fichiers utilisateur d'Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:96
+#: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -6681,11 +7071,11 @@ msgstr ""
 "Ne peut cr�er le dossier sp�cifi� :\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:153
+#: shell/e-shell-folder-creation-dialog.c:156
 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:245
+#: shell/e-shell-folder-creation-dialog.c:248
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Cr�ez un nouveau dossier"
 
@@ -6697,27 +7087,27 @@ 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:318
+#: shell/e-shell-folder-selection-dialog.c:319
 msgid "New..."
 msgstr "Nouveau..."
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
-#: shell/e-shell-view-menu.c:159
+#: shell/e-shell-view-menu.c:173
 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:165
+#: shell/e-shell-view-menu.c:179
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne peut �tre ex�cut�."
 
-#: shell/e-shell-view-menu.c:194
+#: shell/e-shell-view-menu.c:208
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:196
+#: shell/e-shell-view-menu.c:210
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6727,34 +7117,30 @@ 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:360
+#: shell/e-shell-view-menu.c:374
 msgid "Go to folder..."
 msgstr "Aller au dossier..."
 
-#: shell/e-shell-view.c:143
+#: shell/e-shell-view.c:148
 msgid "(No folder displayed)"
 msgstr "(Aucun dossier affich�)"
 
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Dossiers"
-
-#: shell/e-shell-view.c:1124
+#: shell/e-shell-view.c:1134
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1126
+#: shell/e-shell-view.c:1136
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell.c:372
+#: shell/e-shell.c:378
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne peut activer l'entrep�t local -- %s"
 
-#: shell/e-shell.c:1242
+#: shell/e-shell.c:1248
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6763,15 +7149,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:123
+#: shell/e-shortcuts-view.c:134
 msgid "Create new shortcut group"
 msgstr "Cr�er un nouveau groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:137
 msgid "Group name:"
 msgstr "Nom du groupe :"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:260
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -6780,75 +7166,75 @@ msgstr ""
 "Voulez-vous vraiment enlever le groupe\n"
 "� %s � de la barre de raccourcis ?"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:265
 msgid "Don't remove"
 msgstr "Ne pas enlever"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:276
 msgid "_Small Icons"
 msgstr "_Petites icones"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:277
 msgid "Show the shortcuts as small icons"
 msgstr "Affiche les raccourcis sous forme de petites icones"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:279
 msgid "_Large Icons"
 msgstr "_Grandes icones"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:280
 msgid "Show the shortcuts as large icons"
 msgstr "Affiche les raccourcis sous forme de grandes icones"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:291
 msgid "_New Group..."
 msgstr "_Nouveau groupe..."
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:292
 msgid "Create a new shortcut group"
 msgstr "Cr�er un nouveau groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:294
 msgid "_Remove This Group..."
 msgstr "_Supprimer ce groupe..."
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:295
 msgid "Remove this shortcut group"
 msgstr "Supprime ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:300
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Afficher la barre de _raccourcis"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:301
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Afficher la barre de _raccourcis"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate"
 msgstr "Activer"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate this shortcut"
 msgstr "Active ce raccourci"
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:388
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Supprime ce raccourci de la barre de raccourcis"
 
-#: shell/e-shortcuts.c:375
+#: shell/e-shortcuts.c:379
 msgid "Error saving shortcuts."
 msgstr "Erreur d'enregistrement des raccourcis."
 
-#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: 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:42
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
 msgid "_View"
 msgstr "_Vue"
 
-#: shell/e-storage-set-view.c:468
+#: shell/e-storage-set-view.c:649
 msgid "View the selected folder"
 msgstr "Voir le s�lecteur de dossier"
 
@@ -6856,47 +7242,47 @@ msgstr "Voir le s�lecteur de dossier"
 msgid "(No name)"
 msgstr "(Pas de nom)"
 
-#: shell/e-storage.c:429
+#: shell/e-storage.c:459
 msgid "No error"
 msgstr "Pas d'erreur"
 
-#: shell/e-storage.c:431
+#: shell/e-storage.c:461
 msgid "Generic error"
 msgstr "Erreur g�n�rique"
 
-#: shell/e-storage.c:433
+#: shell/e-storage.c:463
 msgid "A folder with the same name already exists"
 msgstr "Un dossier avec le m�me nom existe"
 
-#: shell/e-storage.c:435
+#: shell/e-storage.c:465
 msgid "The specified folder type is not valid"
 msgstr "Le type de dossier sp�cifi� n'est pas valide"
 
-#: shell/e-storage.c:437
+#: shell/e-storage.c:467
 msgid "I/O error"
 msgstr "Erreur d'E/S"
 
-#: shell/e-storage.c:439
+#: shell/e-storage.c:469
 msgid "Not enough space to create the folder"
 msgstr "Pas suffisemment d'espace pour cr�er le dossier"
 
-#: shell/e-storage.c:441
+#: shell/e-storage.c:471
 msgid "The specified folder was not found"
 msgstr "Le dossier sp�cifi� n'a pas �t� trouv�"
 
-#: shell/e-storage.c:443
+#: shell/e-storage.c:473
 msgid "Function not implemented in this storage"
 msgstr "La fonction n'est pas impl�ment� dans cet entrepot"
 
-#: shell/e-storage.c:445
+#: shell/e-storage.c:475
 msgid "Permission denied"
 msgstr "Permission refus�e"
 
-#: shell/e-storage.c:447
+#: shell/e-storage.c:477
 msgid "Operation not supported"
 msgstr "Op�ration non support�e"
 
-#: shell/e-storage.c:449
+#: shell/e-storage.c:479
 msgid "The specified type is not supported in this storage"
 msgstr "Le type sp�cifi� n'est pas support� dans cet entrepot"
 
@@ -6905,7 +7291,7 @@ msgstr "Le type sp�cifi� n'est pas support� dans cet entrepot"
 msgid "The Evolution shell."
 msgstr "Ne peut initialiser le shell Evolution."
 
-#: shell/main.c:73
+#: shell/main.c:83
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -6947,7 +7333,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:98
+#: shell/main.c:108
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6955,15 +7341,19 @@ msgstr ""
 "Merci\n"
 "L'�quipe d'Evolution\n"
 
-#: shell/main.c:129
+#: shell/main.c:139
 msgid "Cannot initialize the Evolution shell."
 msgstr "Ne peut initialiser le shell Evolution."
 
-#: shell/main.c:175
-msgid "Disable."
-msgstr "D�sactiver."
+#: shell/main.c:185
+msgid "Disable splash screen"
+msgstr ""
 
-#: shell/main.c:195
+#: shell/main.c:186
+msgid "Send the debugging output of all components to a file."
+msgstr ""
+
+#: shell/main.c:219
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne peut initialiser le composant Bonobo"
 
@@ -6987,8 +7377,7 @@ msgstr "Rechercher un contact"
 msgid "New contact"
 msgstr "Nouveau contact"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
 msgid "Previews the message to be printed"
 msgstr "Visualise le message a imprimer"
 
@@ -6996,7 +7385,7 @@ msgstr "Visualise le message a imprimer"
 msgid "Print contacts"
 msgstr "Imprimer les contacts"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
 msgid "Stop"
 msgstr "Arr�ter"
 
@@ -7022,7 +7411,7 @@ msgstr "Sources du carnet d'adresses"
 msgid "_Contact"
 msgstr "_Contacts"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
 #: ui/evolution-contact-editor.xml.h:15
 msgid "_Print..."
 msgstr "_Imprimer..."
@@ -7031,9 +7420,9 @@ msgstr "_Imprimer..."
 msgid "_Search for contacts"
 msgstr "_Rechercher des contacts"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
+#: 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"
 msgstr "_Outils"
 
@@ -7046,121 +7435,161 @@ msgid "Alter preferences"
 msgstr "Modifier les pr�f�rences"
 
 #: ui/evolution-calendar.xml.h:4
+#, fuzzy
+msgid "Create a new all day Event"
+msgstr "Cr�e un nouveau calendrier"
+
+#: ui/evolution-calendar.xml.h:5
 msgid "Create a new appointment"
 msgstr "Cr�e un nouveau rendez-vous"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Create a new calendar"
 msgstr "Cr�e un nouveau calendrier"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Day"
 msgstr "Jour"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Go To"
 msgstr "Aller �"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Go back in time"
 msgstr "Recule dans le temps"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go forward in time"
 msgstr "Avance dans le temps"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
+#, 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
 msgid "Go to a specific date"
 msgstr "Va � une date pr�cise"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to present time"
 msgstr "Va � la date actuelle"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr "Mois"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
-msgid "New Appointment"
-msgstr "Nouveau rendez-vous"
+msgid "New _Event"
+msgstr "Nouveau Ca_lendrier"
 
-#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
+#: 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:16
+#: ui/evolution-calendar.xml.h:20
 msgid "Open Calendar"
 msgstr "Ouvrir un calendrier"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:21
 msgid "Prev"
 msgstr "Pr�c"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Previews the calendar to be printed"
+msgstr "Visualise le message a imprimer"
+
+#: ui/evolution-calendar.xml.h:25
 #, fuzzy
 msgid "Print calendar"
 msgstr "Imprimer le Calendrier"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 msgid "Print this Calendar"
 msgstr "Imprimer ce calendrier"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
 msgid "Save As"
 msgstr "Enregistrer sous"
 
-#: ui/evolution-calendar.xml.h:24
+#: 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:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show 1 day"
 msgstr "Affiche une journ�e"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show 1 month"
 msgstr "Affiche un mois"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show 1 week"
 msgstr "Affiche une semaine"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Affiche une semaine de travail"
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
-#: widgets/misc/e-dateedit.c:413
+#: 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:31
+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "W_ork Week"
+msgstr "Semaine de travail"
+
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Semaine"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
 #, fuzzy
 msgid "_Appointment"
 msgstr "Rendez-vous"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
+#: ui/evolution-calendar.xml.h:38
+#, fuzzy
+msgid "_Day"
+msgstr "Jour"
+
+#: ui/evolution-calendar.xml.h:39
+#, 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:34
+#: ui/evolution-calendar.xml.h:41
 msgid "_Open Calendar"
 msgstr "_Ouvrir un calendrier"
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: 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-calendar.xml.h:45
+#, fuzzy
+msgid "_Week"
+msgstr "Semaine"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Supprimer cet �l�ment"
@@ -7183,7 +7612,7 @@ 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:35 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Imprimer..."
 
@@ -7217,7 +7646,7 @@ 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:29
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
 msgid "_File"
 msgstr "_Fichier"
 
@@ -7272,7 +7701,7 @@ msgstr "Ferme ce rendez-vous"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "Cop_ier vers le dossier... (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
+#: 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"
@@ -7369,7 +7798,7 @@ msgid "Print Setup"
 msgstr "Configuration de l'impression"
 
 #: 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
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -7393,7 +7822,8 @@ msgstr "S�lectionnez un Dossier"
 msgid "Schedule some sort of a meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+#: 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"
 
@@ -7417,12 +7847,12 @@ msgid "_About..."
 msgstr "� _propos..."
 
 #: 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:26
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
 msgid "_Close"
 msgstr "_Fermer"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_Contact (FIXME)"
 msgstr "_Contact (FIXME)"
 
@@ -7436,7 +7866,7 @@ msgid "_Debug"
 msgstr "_D�bog"
 
 #: 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:33
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
 msgid "_Help"
 msgstr "_Aide"
 
@@ -7479,7 +7909,7 @@ msgstr "_Coller"
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Propri�t�s..."
@@ -7489,7 +7919,7 @@ 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:40
+#: ui/evolution.xml.h:41
 msgid "_Task (FIXME)"
 msgstr "_T�che (FIXME)"
 
@@ -7520,260 +7950,396 @@ msgid "New Mail"
 msgstr "Nouveau courrier"
 
 #: ui/evolution-mail.xml.h:2
+msgid "Apply any new filters to the mail in this box"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:3
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:4
 msgid "Compose"
 msgstr "Composer"
 
-#: ui/evolution-mail.xml.h:3
+#: ui/evolution-mail.xml.h:5
 msgid "Compose a new message"
 msgstr "Compose un nouveau message"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Configure Folder..."
+msgstr "_Copier vers le dossier..."
+
+#: ui/evolution-mail.xml.h:8
 msgid "Copy message to a new folder"
 msgstr "Copie le message vers un nouveau dossier"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail.xml.h:9
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Copie le message vers un nouveau dossier"
+
+#: ui/evolution-mail.xml.h:10
 #, fuzzy
 msgid "Create _Virtual Folder From Message"
 msgstr "Cr�er une r�gle � partir du message"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Delete the selected messages"
+msgstr "Imprime le message s�lectionn�"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Display all of the message headers"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail.xml.h:15
+#, fuzzy
+msgid "Edit Message"
+msgstr "_�diter le message"
+
+#: ui/evolution-mail.xml.h:16
 #, fuzzy
-msgid "Empty Trash"
+msgid "Edit the current message"
+msgstr "la date actuelle"
+
+#: ui/evolution-mail.xml.h:17
+#, fuzzy
+msgid "Empty _Trash"
 msgstr "Jours vides :"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Expunge"
+msgstr "_Nettoyer"
+
+#: ui/evolution-mail.xml.h:19
 #, fuzzy
 msgid "Filter on Se_nder"
 msgstr "Filtre sur l'exp�diteur"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:20
 #, fuzzy
 msgid "Filter on _Recipients"
 msgstr "Filtre sur les destinataires"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:21
 #, fuzzy
 msgid "Filter on _Subject"
 msgstr "Filtre sur le sujet"
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:22
+msgid "Finaly remove all mails tagged for deletion"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:23
 msgid "Forget _Passwords"
 msgstr "Oublier les _mots de passe"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:25
 #, fuzzy
 msgid "Forward As"
 msgstr "Faire suivre"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:27
+msgid "Forward the selected mail to someone"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:29
 #, fuzzy
-msgid "Full Headers"
+msgid "Forward this message in-line with your mail, so you can edit it"
+msgstr "Faire suivre un message sans sujet"
+
+#: ui/evolution-mail.xml.h:30
+#, fuzzy
+msgid "Full _Headers"
 msgstr "Rechercher compl�te"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:31
+#, fuzzy
+msgid "Hide Deleted Messages"
+msgstr "Supprimer le message"
+
+#: ui/evolution-mail.xml.h:32
 #, fuzzy
 msgid "Hide S_elected Messages"
 msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:33
 #, fuzzy
 msgid "Hide _Deleted Messages"
 msgstr "Supprimer le message"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:34
 #, fuzzy
 msgid "Hide _Read messages"
 msgstr "Message suivi - %s"
 
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:35
 #, fuzzy
-msgid "Inline"
-msgstr "Voir en ligne"
+msgid "Invert Selection"
+msgstr "_Inverser la s�lection"
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:36
 #, fuzzy
 msgid "Manage _Subscriptions..."
 msgstr "G�rer les abonnements..."
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:37
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Marquer comme lu"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:38
 #, fuzzy
 msgid "Mark All as R_ead"
 msgstr "Marquer comme lu"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:39
+#, fuzzy
+msgid "Mark As Read"
+msgstr "_Marquer comme lus"
+
+#: ui/evolution-mail.xml.h:40
+msgid "Mark As U_nread"
+msgstr "Marquer comme _non lu"
+
+#: ui/evolution-mail.xml.h:41
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Marquer comme non lu"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:42
 #, fuzzy
-msgid "Message _Display"
-msgstr "Nettoyer l'affichage des messages"
+msgid "Mark the selected messages as having been read"
+msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:43
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:44
 msgid "Move"
 msgstr "D�placer"
 
-#: ui/evolution-mail.xml.h:29
+#: 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:33
+#: ui/evolution-mail.xml.h:46
+#, 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.xml.h:48
+#, fuzzy
+msgid "Open the current 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.xml.h:54
 msgid "Print message to the printer"
 msgstr "Imprime le message vers l'imprimante"
 
-#: ui/evolution-mail.xml.h:36
-#, fuzzy
-msgid "Quoted"
-msgstr "Note"
+#: ui/evolution-mail.xml.h:55
+msgid "Print message..."
+msgstr "Imprimer le message..."
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:58
 msgid "Redirect (FIXME: implement me)"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:61
 msgid "Reply to _All"
 msgstr "R�pondre � _tous"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:62
+#, fuzzy
+msgid "Reply to all"
+msgstr "R�pondre � tous"
+
+#: ui/evolution-mail.xml.h:64
+#, fuzzy
+msgid "Reply to sender"
+msgstr "R�pondre � l'exp�diteur"
+
+#: ui/evolution-mail.xml.h:66
 msgid "S_ource"
 msgstr "S_ource"
 
-#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "Save the message into a new file"
+msgstr "Enregistrer le message dans un dossier sp�cifi�"
+
+#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "S�lectionnez _tout"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:70
 #, fuzzy
 msgid "Select _Thread"
 msgstr "S�lectionnez _tout"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:71
 #, fuzzy
-msgid "Send and Receive"
+msgid "Send / Receive"
 msgstr "R�ception des messages"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:72
+msgid "Send a reply to the person who sent you this mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:73
+msgid "Send a single mail in reply to all the selected mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:74
+#, fuzzy
+msgid ""
+"Send queued mail\n"
+"    and retrieve new mail"
+msgstr "Envoie les messages en attente et r�cup�re les nouveaux messages"
+
+#: 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.xml.h:48
+#: ui/evolution-mail.xml.h:77
 #, fuzzy
 msgid "Show _All"
 msgstr "Afficher tout"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:79
 msgid "Threaded Message list"
 msgstr "Liste des messages par enfilade"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:80
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "Imprime le message s�lectionn�"
+
+#: ui/evolution-mail.xml.h:82
 msgid "VFolder on Se_nder"
 msgstr "Dossier virtuel sur l'e_xp�diteur"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:83
 msgid "VFolder on _Recipients"
 msgstr "Dossier virtuel sur les de_stinataires"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:84
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Dossier virtuel sur le sujet"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:85
 msgid "View Raw Message Source"
 msgstr "Voir la source brut du message"
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:86
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "�diteur de dossier _virtuel..."
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Actions"
-msgstr "_Actions"
-
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:87
 msgid "_Apply Filters"
 msgstr "_Appliquer les filtres"
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:88
 #, fuzzy
-msgid "_Compose"
-msgstr "Composer"
+msgid "_Attachment"
+msgstr "Pi�ce-jointe"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:89
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:90
 #, fuzzy
 msgid "_Create Filter From Message"
 msgstr "Cr�er une r�gle � partir du message"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:92
 msgid "_Expunge"
 msgstr "_Nettoyer"
 
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:93
 #, fuzzy
 msgid "_Filters..."
 msgstr "_Filtres de message..."
 
-#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
 msgid "_Folder"
 msgstr "_Dossier"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:95
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:96
+#, 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"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:98
 #, fuzzy
 msgid "_Mail Message"
 msgstr "_Message �lectronique (FIXME)"
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:99
 #, fuzzy
 msgid "_Mail Settings..."
 msgstr "R�glages..."
 
-#: ui/evolution-mail.xml.h:69
-#, fuzzy
-msgid "_Message Hiding"
-msgstr "_Message"
-
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail.xml.h:100
 msgid "_Move to Folder..."
 msgstr "_D�placer vers le dossier..."
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail.xml.h:101
 #, fuzzy
 msgid "_Open Selected Items"
 msgstr "Ouvrir la t�che"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail.xml.h:103
+#, fuzzy
+msgid "_Quoted"
+msgstr "Note"
+
+#: ui/evolution-mail.xml.h:104
+#, fuzzy
+msgid "_Reply"
+msgstr "R�pondre"
+
+#: ui/evolution-mail.xml.h:105
+#, fuzzy
+msgid "_Resend Messages"
+msgstr "_�diter le message"
+
+#: ui/evolution-mail.xml.h:107
+msgid "_Save Message As..."
+msgstr "_Enregistrer le message sous..."
+
+#: ui/evolution-mail.xml.h:108
 #, fuzzy
-msgid "_Send and Receive"
+msgid "_Send / Receive"
 msgstr "R�ception des messages"
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail.xml.h:109
 msgid "_Threaded"
 msgstr "_Enfiler"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:111
 msgid "_Undelete"
 msgstr "_R�cup�rer"
 
@@ -8030,7 +8596,7 @@ msgstr "D�faire"
 msgid "Undo the last action"
 msgstr "Supprimer l'action"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
 msgid "_Appointment (FIXME)"
 msgstr "_Rendez-vous (FIXME)"
 
@@ -8159,122 +8725,134 @@ msgstr "Travail en cours"
 msgid "_About Evolution..."
 msgstr "� _propos d'Evolution..."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:25
+msgid "_Actions"
+msgstr "_Actions"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Dossier"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:33
 msgid "_Go to Folder..."
 msgstr "_Aller au dossier..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:35
 msgid "_Import file..."
 msgstr "_Importer un fichier..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:36
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:37
 #, fuzzy
 msgid "_Mail message"
 msgstr "_Message �lectronique (FIXME)"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_New Folder"
 msgstr "Nouveau dossier virtuel"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Afficher la barre de _raccourcis"
 
 #. 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:2475
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+msgid "Tentative"
+msgstr "Essai"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Occup�"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "Hors du bureau"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Pas d'information"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
 msgid "_Invite Others..."
 msgstr "_Inviter d'autres personnes..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
 msgid "_Options"
 msgstr "_Options"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
 msgid "Show _Only Working Hours"
 msgstr "Afficher _seulement les heures de travail"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
 msgid "Show _Zoomed Out"
 msgstr "Afficher _Zomm� arri�re"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
 msgid "_Update Free/Busy"
 msgstr "_Mettre � jour Libre/Occup�"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr "_Choix automatique"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
 msgid "_All People and Resources"
 msgstr "_Toutes les personnes et ressources"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
 msgid "All _People and One Resource"
 msgstr "Toute les _personnes et une ressource"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
 msgid "_Required People"
 msgstr "Personnes _n�cessaires"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
 msgid "Required People and _One Resource"
 msgstr "Personnes n�cessaires et _une ressource"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
 msgid "Meeting _start time:"
 msgstr "Heure de _d�but de la r�union :"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
 msgid "Meeting _end time:"
 msgstr "Heure de _fin de la r�union :"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
 msgid "All Attendees"
 msgstr "Tout les invit�s"
 
-#: widgets/menus/gal-view-menus.c:171
+#: widgets/menus/gal-view-menus.c:177
 #, fuzzy
 msgid "_Current View"
 msgstr "la date actuelle"
 
+#: widgets/menus/gal-view-menus.c:196
+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
@@ -8286,93 +8864,106 @@ msgstr "LMMJVSD"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
 msgid "Now"
 msgstr "Maintenant"
 
-#: widgets/misc/e-cell-date-edit.c:239
+#: widgets/misc/e-cell-date-edit.c:242
 msgid "OK"
 msgstr ""
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#.
-#: widgets/misc/e-cell-date-edit.c:460
-#, fuzzy
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S%n"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
-#: 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"
-
-#. strftime format of a time in 12-hour format.
-#.
-#: widgets/misc/e-cell-date-edit.c:469
-#, fuzzy
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p%n"
-
-#. FIXME: Better message needed.
-#: widgets/misc/e-cell-date-edit.c:736
-msgid "The time is invalid"
+#: widgets/misc/e-cell-date-edit.c:723
+#, fuzzy, c-format
+msgid "The time must be in the format: %s"
 msgstr ""
+"La date doit �tre entr�e dans ce format :\n"
+"\n"
+"%s"
 
 #: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:160
+#: widgets/misc/e-filter-bar.c:166
 #, fuzzy
 msgid "Save Search"
 msgstr "Rechercher"
 
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:237
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Avanc�e"
 
-#: widgets/misc/e-filter-bar.c:311
+#: widgets/misc/e-filter-bar.c:317
 #, fuzzy
 msgid "Advanced ..."
 msgstr "Avanc�e..."
 
-#: widgets/misc/e-messagebox.c:141
+#: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Information"
 
-#: widgets/misc/e-messagebox.c:148
+#: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Avertissement"
 
-#: widgets/misc/e-messagebox.c:162
+#: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Question"
 
-#: widgets/misc/e-messagebox.c:169
+#: widgets/misc/e-messagebox.c:180
 msgid "Message"
 msgstr "Message"
 
 #. 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 "Ne plus afficher ce message."
 
-#: widgets/misc/e-search-bar.c:140
+#: widgets/misc/e-search-bar.c:148
 msgid "Sear_ch"
 msgstr "Recher_cher"
 
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Adress 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 :"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr ""
@@ -8381,21 +8972,208 @@ msgstr ""
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:153
+#: wombat/wombat.c:173
 #, fuzzy
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "Ne peut initialiser GNOME"
 
-#: wombat/wombat.c:165
+#: wombat/wombat.c:185
 #, fuzzy
 msgid "init_corba(): could not initialize GNOME"
 msgstr "Ne peut initialiser GNOME"
 
-#: wombat/wombat.c:178
+#: wombat/wombat.c:198
 #, fuzzy
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Ne peut initialiser Bonobo"
 
+#, fuzzy
+#~ msgid "Click here to add a contact"
+#~ msgstr "* Cliquez ici pour ajouter un contact *"
+
+#, fuzzy
+#~ msgid ""
+#~ "This option will connect to the server using a the PLAIN SASL mechanism if "
+#~ "the server supports it."
+#~ msgstr ""
+#~ "Cette option vous connectera au serveur IMAP en utilisant un mots de passe "
+#~ "en clair."
+
+#~ msgid "No such host %s."
+#~ msgstr "Aucun h�te %s."
+
+#~ msgid "Temporarily unable to look up hostname %s."
+#~ msgstr "Temporairement impossible de r�soudre le nom d'h�te %s."
+
+#~ msgid "URL string `%s' contains no protocol"
+#~ msgstr "La cha�ne d'URL � %s � ne contient pas de protocole"
+
+#~ msgid "URL string `%s' contains an invalid protocol"
+#~ msgstr "La cha�ne d'URL � %s � contient un protocole invalide"
+
+#~ msgid "Port number in URL `%s' is non-numeric"
+#~ 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."
+
+#, fuzzy
+#~ 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 ""
+#~ "Pour la connexion aux serveurs POP. Le protocole POP peut aussi �tre utilis� "
+#~ "pour r�cup�rer les courriers depuis certains fournisseurs de courriers Web "
+#~ "et de syst�mes de courriers propri�taires."
+
+#, fuzzy
+#~ msgid ""
+#~ "For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+#~ "connection.\n"
+#~ msgstr ""
+#~ "Pour livrer le courrier en vous connectant � un distributeur distant "
+#~ "utilisant SMTP."
+
+#~ msgid "No authentication required"
+#~ msgstr "Aucune identification requise"
+
+#~ 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 ""
+#~ "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"
+
+#~ 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"
+
+#~ msgid "Keep mail on server"
+#~ msgstr "Garder les courriers sur le serveur"
+
+#~ 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 :"
+
+#~ msgid "Plain Text"
+#~ msgstr "Texte plein"
+
+#~ msgid "Remember my password"
+#~ msgstr "Se souvenir de mon mot de passe"
+
+#, fuzzy
+#~ msgid "Reply address:"
+#~ msgstr "Adresse �lectronique :"
+
+#~ msgid "Required"
+#~ msgstr "Requis"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Transport Authentication"
+#~ msgstr "Identification"
+
+#~ msgid ""
+#~ "Type the name by which you would like to refer to these servers. For "
+#~ "example: \"Work\" or \"Home\"."
+#~ msgstr ""
+#~ "Tapez le nom sous lequel vous voulez identifier ces serveurs. Par exemple : "
+#~ "� Travail � ou � Maison �."
+
+#~ msgid "minutes."
+#~ msgstr "minutes."
+
+#~ msgid "%s message %d of %d (uid \"%s\")"
+#~ msgstr "%s message %d de %d (uid � %s �)"
+
+#~ msgid "[ %s ]"
+#~ msgstr "[ %s ]"
+
+#~ msgid "%s, et al."
+#~ msgstr "%s, et tous"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "_Message Hiding"
+#~ msgstr "_Message"
+
 #~ msgid "Disabled"
 #~ msgstr "D�sactiv�"
 
@@ -8563,9 +9341,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Sender contains"
 #~ msgstr "Le nom contient"
 
-#~ msgid "Connecting to server"
-#~ msgstr "Connexion au serveur"
-
 #~ msgid "Connect to server"
 #~ msgstr "Connecter au serveur"
 
@@ -8590,13 +9365,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Registering local folder"
 #~ msgstr "Enregistrement du dossier local"
 
-#~ msgid ""
-#~ "Unable to register folder '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ne peut enregistrer le dossier � %s � :\n"
-#~ "%s"
-
 #~ msgid "Appending \"%s\""
 #~ msgstr "Adjation de � %s �"
 
@@ -8657,9 +9425,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ "Ne peut ouvrir l'emplacement � %s � :\n"
 #~ "%s"
 
-#~ msgid "Subscribe to folder \"%s\""
-#~ msgstr "S'abonne au dossier � %s �"
-
 #~ msgid "Unsubscribe from folder \"%s\""
 #~ msgstr "Se d�sabonne du dossier � %s �"
 
@@ -8691,31 +9456,12 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Get Mail"
 #~ msgstr "R�cup�rer"
 
-#~ msgid "Mar_k As Read"
-#~ msgstr "_Marquer comme lus"
-
-#~ msgid "Mark As U_nread"
-#~ msgstr "Marquer comme _non lu"
-
-#~ msgid "Print Preview of message..."
-#~ msgstr "Aper�u avant impression du message..."
-
-#~ msgid "Print message..."
-#~ msgstr "Imprimer le message..."
-
 #~ msgid "Reply to _Sender"
 #~ msgstr "R�pondre � l'_exp�diteur"
 
 #~ msgid "Show _All Messages"
 #~ msgstr "Afficher _tous les messages"
 
-#, fuzzy
-#~ msgid "_Configure Folder..."
-#~ msgstr "_Copier vers le dossier..."
-
-#~ msgid "_Edit Message"
-#~ msgstr "_�diter le message"
-
 #~ msgid "_Filter on Subject"
 #~ msgstr "_Filtrer sur le sujet"
 
@@ -8728,9 +9474,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "_Print Message"
 #~ msgstr "_Imprimer le message"
 
-#~ msgid "_Save Message As..."
-#~ msgstr "_Enregistrer le message sous..."
-
 #~ msgid "_VFolder on Subject"
 #~ msgstr "_Dossier Virtuel sur le sujet"
 
@@ -8855,9 +9598,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Retrieving message %d of %d"
 #~ msgstr "R�cup�ration du message %d sur %d"
 
-#~ msgid "Writing message %d of %d"
-#~ msgstr "�criture du message %d du %d"
-
 #~ msgid "Saving changes to %s"
 #~ msgstr "Enregistrement des changements vers %s"
 
@@ -9073,12 +9813,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Server:"
 #~ msgstr "Serveur :"
 
-#~ msgid "Detect supported types..."
-#~ msgstr "D�tecter les types support�s..."
-
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Ne pas effacer les messages du serveur"
-
 #~ msgid "Mail source type:"
 #~ msgstr "Type de source de courrier :"
 
@@ -9128,9 +9862,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Edit News Server"
 #~ msgstr "�diter le serveur de news"
 
-#~ msgid "Testing \"%s\""
-#~ msgstr "Test de \"%s\""
-
 #~ msgid "The connection was successful!"
 #~ msgstr "La connexion est concluante !"
 
@@ -9158,9 +9889,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Send messages in HTML format"
 #~ msgstr "Envoie les messages au format HTML"
 
-#~ msgid "Available Categories:"
-#~ msgstr "Cat�gories disponibles : "
-
 #~ msgid "External Directories"
 #~ msgstr "Annuaires externes"
 
@@ -9212,9 +9940,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ "aller. Quand vous cliquez sur un jour, vous\n"
 #~ "y serez automatiquement amen�."
 
-#~ msgid "Deleted"
-#~ msgstr "Supprim�"
-
 #~ msgid "Mail Source"
 #~ msgstr "Source de courrier"
 
@@ -9227,15 +9952,9 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Expunge \"%s\""
 #~ msgstr "Nettoie \"%s\""
 
-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "Marquage des messages du dossier \"%s\""
-
 #~ msgid "Mark messages in folder \"%s\""
 #~ msgstr "Marque les messages du dossier \"%s\""
 
-#~ msgid "Marking message %d of %d"
-#~ msgstr "Marque le message %d du %d"
-
 #~ msgid "Scan folders in \"%s\""
 #~ msgstr "Scrute les dossiers dans \"%s\""
 
@@ -9254,9 +9973,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Forward message \"%s\""
 #~ msgstr "Faire suivre le message \"%s\""
 
-#~ msgid "Forward a message without a subject"
-#~ msgstr "Faire suivre un message sans sujet"
-
 #~ msgid ""
 #~ "Failed to generate mime part from message while generating forwarded message."
 #~ msgstr ""
@@ -9571,9 +10287,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Highlight not yet due items"
 #~ msgstr "Mettre en �vidence les �l�ments non encore achev�"
 
-#~ msgid "Highlight items due today"
-#~ msgstr "Mettre en �vidence les �l�ments s'achevant aujourd'hui"
-
 #~ msgid "To Do List"
 #~ msgstr "Liste '� Faire'"
 
@@ -9595,9 +10308,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Could not create summary"
 #~ msgstr "Ne peut cr�er le r�sum�"
 
-#~ msgid "Cannot get message: %s"
-#~ msgstr "Ne peut obtenir le message : %s"
-
 #~ msgid "Could not rename folder %s to %s: destination exists"
 #~ msgstr "Ne peut renommer le dossier %s vers %s : la destination existe"
 
@@ -9648,18 +10358,12 @@ 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 "Open in New Window"
-#~ msgstr "Ouvrir dans une nouvelle fen�tre"
-
 #~ msgid "Forward Message"
 #~ msgstr "Faire suivre le message"
 
 #~ msgid "Copy Message"
 #~ msgstr "Copier le message"
 
-#~ msgid "New Ca_lendar"
-#~ msgstr "Nouveau Ca_lendrier"
-
 #~ msgid "_Create New Folder..."
 #~ msgstr "_Cr�er un nouveau dossier..."
 
diff --git a/po/ga.po b/po/ga.po
index 2d77fe743b..5a7b7436e9 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-03-15 11:10+0100\n"
+"POT-Creation-Date: 2001-04-14 08:51-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,197 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3209
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3211
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3212
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3057
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3058
+#: addressbook/backend/ebook/e-card.c:3214
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3059
+#: addressbook/backend/ebook/e-card.c:3215
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3060
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3074
+#: addressbook/backend/ebook/e-card.c:3230
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3241
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3243
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3244
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3245
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3090
+#: addressbook/backend/ebook/e-card.c:3246
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3091
+#: addressbook/backend/ebook/e-card.c:3247
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3092
+#: addressbook/backend/ebook/e-card.c:3248
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3093
+#: addressbook/backend/ebook/e-card.c:3249
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3106
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3118
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3121
+#: addressbook/backend/ebook/e-card.c:3277
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3145
+#: addressbook/backend/ebook/e-card.c:3301
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3148
+#: addressbook/backend/ebook/e-card.c:3304
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3167
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3173
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3185
+#: addressbook/backend/ebook/e-card.c:3341
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3355
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3201
+#: addressbook/backend/ebook/e-card.c:3357
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3206
+#: addressbook/backend/ebook/e-card.c:3362
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3207
+#: addressbook/backend/ebook/e-card.c:3363
 msgid ""
 "\n"
 "Comment: "
@@ -219,13 +219,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3220
+#: addressbook/backend/ebook/e-card.c:3376
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3223
+#: addressbook/backend/ebook/e-card.c:3379
 msgid ""
 "\n"
 "Public Key: "
@@ -239,15 +239,15 @@ msgstr ""
 msgid "Imports GnomeCard files into Evolution."
 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
+#: 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:68 calendar/gui/main.c:54
+#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
 msgid "Could not initialize Bonobo"
 msgstr ""
 
@@ -259,20 +259,20 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:651
+#: addressbook/conduit/address-conduit.c:654
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:652
+#: addressbook/conduit/address-conduit.c:655
 #: calendar/conduits/calendar/calendar-conduit.c:732
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr ""
 
-#: 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 ""
 
@@ -280,7 +280,7 @@ 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:4
+#: mail/mail-config.glade.h:7
 msgid "Add"
 msgstr ""
 
@@ -321,7 +321,6 @@ msgstr ""
 
 #: addressbook/contact-editor/contact-editor.glade.h:10
 #: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:27
 msgid "General"
 msgstr ""
 
@@ -339,7 +338,7 @@ msgid "Phone Types"
 msgstr ""
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "Primary Email"
 msgstr ""
 
@@ -352,7 +351,7 @@ msgid "Web page address:"
 msgstr ""
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:74
 msgid "_Add"
 msgstr ""
 
@@ -378,8 +377,8 @@ msgid "_Company:"
 msgstr "Greamaigh"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
+#: 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"
@@ -434,129 +433,125 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "Scr�os an sceal seo"
 
-#: addressbook/contact-editor/e-contact-editor.c:590
+#: addressbook/contact-editor/e-contact-editor.c:603
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/widgets/e-addressbook-view.c:676
 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:581
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1310
 msgid "Business"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/contact-editor/e-contact-editor.c:1244
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "Car"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1248
 #, fuzzy
 msgid "Company"
 msgstr "Greamaigh"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
-#: addressbook/contact-editor/e-contact-editor.c:1298
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1311
 msgid "Home"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/contact-editor/e-contact-editor.c:1250
 msgid "Home 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Home Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/contact-editor/e-contact-editor.c:1253
 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:591
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
+#: 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"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:662
 msgid "Other Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Pager"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1257
 #, fuzzy
 msgid "Primary"
 msgstr "Tosa�ocht"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/gui/widgets/e-addressbook-view.c:664
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/widgets/e-addressbook-view.c:665
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:1260
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
-#: addressbook/gui/widgets/e-addressbook-view.c:593
+#: 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:1273
-#: addressbook/gui/widgets/e-addressbook-view.c:594
+#: 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:214
+#: addressbook/contact-editor/e-contact-quick-add.c:223
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:216
+#: addressbook/contact-editor/e-contact-quick-add.c:225
 #, fuzzy
 msgid "Edit Full"
 msgstr "_Fillte�n"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:253
+#: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/widgets/e-addressbook-view.c:643
 msgid "Full Name"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:259
+#: addressbook/contact-editor/e-contact-quick-add.c:268
 #, fuzzy
 msgid "E-mail"
 msgstr "Post"
@@ -674,25 +669,25 @@ msgstr ""
 msgid "_Title:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:241
 msgid "As _Minicards"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:243
+#: addressbook/gui/component/addressbook.c:247
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:399
 #, c-format
 msgid "Enter password for %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:440
+#: addressbook/gui/component/addressbook.c:427
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:445
+#: 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"
@@ -704,172 +699,172 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:568
+#: addressbook/gui/component/addressbook.c:555
 msgid "Show All"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:570
+#: addressbook/gui/component/addressbook.c:557
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:587
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:588
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:602
+#: addressbook/gui/component/addressbook.c:589
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:732
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:95
+#: addressbook/gui/component/addressbook-storage.c:99
 msgid "Other Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:143
+#: addressbook/gui/component/addressbook-config.c:148
 msgid "LDAP Server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:145
+#: addressbook/gui/component/addressbook-config.c:150
 #, fuzzy
 msgid "File"
 msgstr "_Fillte�n"
 
-#: addressbook/gui/component/addressbook-config.c:148
+#: addressbook/gui/component/addressbook-config.c:153
 msgid "Unknown addressbook type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:158
+#: addressbook/gui/component/addressbook-config.c:163
 msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:261
+#: 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-store.c:145
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
 msgid "Password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:162
+#: addressbook/gui/component/addressbook-config.c:167
 msgid "SASL"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:165
+#: addressbook/gui/component/addressbook-config.c:170
 msgid "Unknown auth type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:174
+#: addressbook/gui/component/addressbook-config.c:179
 msgid "Base"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:178
+#: addressbook/gui/component/addressbook-config.c:183
 msgid "Subtree"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-config.c:186
 msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:348
+#: addressbook/gui/component/addressbook-config.c:353
 msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:349
+#: addressbook/gui/component/addressbook-config.c:354
 msgid "FIXME Bind DN Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:351
+#: addressbook/gui/component/addressbook-config.c:356
+#: mail/mail-config.glade.h:50
 msgid "Remember this password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:401
+#: addressbook/gui/component/addressbook-config.c:406
 #: mail/mail-config.glade.h:28
 msgid "Host:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:402
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "FIXME Host help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:404
+#: addressbook/gui/component/addressbook-config.c:409
 #, fuzzy
 msgid "Port:"
 msgstr "Tosa�ocht"
 
-#: addressbook/gui/component/addressbook-config.c:405
+#: addressbook/gui/component/addressbook-config.c:410
 msgid "FIXME Port help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/component/addressbook-config.c:414
 msgid "Root DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:410
+#: addressbook/gui/component/addressbook-config.c:415
 msgid "FIXME Root DN help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:430
+#: addressbook/gui/component/addressbook-config.c:435
 msgid "Search Scope:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:8
+#: addressbook/gui/component/addressbook-config.c:489
 msgid "Authentication:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
+#: addressbook/gui/component/addressbook-config.c:507
+#: mail/mail-config.glade.h:44
 msgid "Path:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:503
+#: addressbook/gui/component/addressbook-config.c:508
 msgid "FIXME Path Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:508
+#: addressbook/gui/component/addressbook-config.c:513
 msgid "Create path if it doesn't exist."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:642
+#: addressbook/gui/component/addressbook-config.c:647
 msgid "Edit Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:644
+#: addressbook/gui/component/addressbook-config.c:649
 msgid "Add Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:660
+#: 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:666
-#: mail/mail-config.glade.h:41
+#: addressbook/gui/component/addressbook-config.c:671
+#: mail/mail-config.glade.h:35
 msgid "Name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:667
+#: addressbook/gui/component/addressbook-config.c:672
 msgid "FIXME Name help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:669
+#: 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:670
+#: addressbook/gui/component/addressbook-config.c:675
 msgid "FIXME Description help text here"
 msgstr ""
 
@@ -878,23 +873,24 @@ 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/folder-browser.c:571
-#: mail/mail-config.glade.h:20 mail/mail-view.c:150
+#: 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:7 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Scr�os"
 
 #: 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:22
+#: mail/mail-config.glade.h:23
 msgid "Edit"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Name"
 msgstr ""
 
@@ -902,44 +898,65 @@ msgstr ""
 msgid "URI"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:259
-#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#: 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 displaying an address."
+msgid "A Bonobo control for an address popup."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A sample Bonobo control which displays an addressbook."
+msgid "A Bonobo control for displaying an address."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "Control that displays an Evolution addressbook minicard."
+msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Evolution Addressbook minicard viewer"
+msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution component for handling contacts."
+msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Factory for the Addressbook Minicard control"
+msgid "Evolution component for handling contacts."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook's address displayer"
+msgid "Factory for the Addressbook Minicard control"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Evolution addressbook component."
+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 ""
 
@@ -951,21 +968,18 @@ msgstr ""
 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
+#: 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/component/select-names/e-select-names-popup.c:136
+#: addressbook/gui/component/select-names/e-select-names-popup.c:146
 #, fuzzy
 msgid "Remove All"
 msgstr "Scr�os"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
-msgid "Edit Contact Info"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #, fuzzy
 msgid "Find..."
@@ -985,7 +999,7 @@ msgstr "Fillte�n _Nua"
 msgid "Select name from:"
 msgstr "Fillte�n _Nua"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
 msgid "Search"
 msgstr ""
 
@@ -1099,75 +1113,165 @@ msgstr ""
 msgid "z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:481
-#: addressbook/gui/widgets/e-minicard.c:435
+#: 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
 msgid "Save as VCard"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-minicard.c:669
+msgid "Send contact to other"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-minicard.c:670
+#, 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
+msgid "Print"
+msgstr "Priont�il"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-minicard.c:672
+#, fuzzy
+msgid "Print Envelope"
+msgstr "Post an sce�l seo"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:641
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/gui/widgets/e-addressbook-view.c:642
+#, fuzzy
+msgid "File As"
+msgstr "_Fillte�n"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:644
 #, fuzzy
 msgid "Email"
 msgstr "Post"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:645
+#, fuzzy
+msgid "Primary Phone"
+msgstr "Tosa�ocht"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:646
+msgid "Assistant Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:647
+msgid "Business Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:648
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:649
+#, fuzzy
+msgid "Company Phone"
+msgstr "Greamaigh"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:650
+msgid "Home Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:651
 msgid "Organization"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:595
+#: addressbook/gui/widgets/e-addressbook-view.c:652
+msgid "Business Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:653
+msgid "Home Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:654
+msgid "Mobile Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:658
+msgid "Business Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:659
+msgid "Home Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:661
+msgid "Other Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:666
+msgid "TTY"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:667
+msgid "Other Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:670
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:596
+#: addressbook/gui/widgets/e-addressbook-view.c:671
 msgid "Department"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:597
+#: addressbook/gui/widgets/e-addressbook-view.c:672
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:673
 #, fuzzy
 msgid "Title"
 msgstr "_Fillte�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:674
 msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:600
+#: addressbook/gui/widgets/e-addressbook-view.c:675
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-view.c:678
 msgid "Spouse"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: addressbook/gui/widgets/e-addressbook-view.c:679
 #, fuzzy
 msgid "Note"
 msgstr "_Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:606
-msgid "Click here to add a contact"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-minicard-control.c:282
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:141
+#: addressbook/gui/widgets/e-minicard-view.c:166
 msgid ""
 "\n"
 "\n"
@@ -1176,7 +1280,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 ""
 
@@ -1371,126 +1475,127 @@ msgstr ""
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:233
+#: calendar/gui/calendar-commands.c:266
 msgid "File not found"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:257
+#: calendar/gui/calendar-commands.c:290
 msgid "Open calendar"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:299
+#: calendar/gui/calendar-commands.c:332
 msgid "Save calendar"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:468
 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:360 calendar/gui/calendar-model.c:895
+#: calendar/gui/e-calendar-table.c:330
 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:363 calendar/gui/calendar-model.c:897
+#: calendar/gui/e-calendar-table.c:331
 #, fuzzy
 msgid "Private"
 msgstr "Priont�il"
 
-#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
+#: calendar/gui/e-calendar-table.c:332
 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:200
+#: 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
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: 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:351
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
 msgid "High"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
-#: calendar/gui/calendar-model.c:1596
+#: 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:352
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
 #, fuzzy
 msgid "Normal"
 msgstr "Sheoladh Chuig duine"
 
-#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: 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:353
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
 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:537 calendar/gui/calendar-model.c:1119
+#: calendar/gui/e-calendar-table.c:406
 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:540 calendar/gui/calendar-model.c:1121
+#: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: 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:425
+#: calendar/gui/e-calendar-table.c:426
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: 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:426
+#: calendar/gui/e-calendar-table.c:427
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: 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:427
+#: calendar/gui/e-calendar-table.c:428
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: 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:428
+#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
+#: camel/camel-service.c:586
 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:276
+#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
 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:285
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:805
+#: calendar/gui/calendar-model.c:799
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1498,63 +1603,62 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:885
+#: calendar/gui/calendar-model.c:879
 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:756
-#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
-#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
-#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
-#: 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: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
 #, fuzzy
 msgid "None"
 msgstr "_Nota"
 
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:967
 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:1007
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1048
 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/calendar-model.c:1061
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:355
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1108
+#: calendar/gui/calendar-model.c:1102
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1598
+#: calendar/gui/calendar-model.c:1571
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1600
+#: calendar/gui/calendar-model.c:1573
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 #, fuzzy
 msgid "No"
 msgstr "_Nota"
@@ -1622,23 +1726,23 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
 msgid "Could not initialize GNOME"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:73
+#: calendar/gui/alarm-notify/notify-main.c:77
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+#: calendar/gui/dialogs/alarm-notify-dialog.c:189
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
+#: 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-notify-dialog.c:202
+#: calendar/gui/dialogs/alarm-notify-dialog.c:207
 msgid "No summary available."
 msgstr ""
 
@@ -1731,7 +1835,7 @@ msgid "Display options"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:162
 msgid "Due Date"
 msgstr ""
 
@@ -1752,7 +1856,7 @@ msgid "Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
 msgid "Friday"
 msgstr ""
 
@@ -1781,7 +1885,7 @@ msgid "Mon"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
 msgid "Monday"
 msgstr ""
 
@@ -1794,11 +1898,12 @@ 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:34
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:165
 msgid "Priority"
 msgstr "Tosa�ocht"
 
@@ -1818,7 +1923,7 @@ msgid "Sat"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:482
 msgid "Saturday"
 msgstr ""
 
@@ -1844,7 +1949,7 @@ msgid "Sun"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:483
 #, fuzzy
 msgid "Sunday"
 msgstr "Post"
@@ -1859,7 +1964,7 @@ msgid "Thu"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
 msgid "Thursday"
 msgstr ""
 
@@ -1880,7 +1985,7 @@ msgid "Tue"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
 msgid "Tuesday"
 msgstr ""
 
@@ -1893,7 +1998,7 @@ msgid "Wed"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
 msgid "Wednesday"
 msgstr ""
 
@@ -1906,35 +2011,35 @@ msgid "minutes before they occur."
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "seconds."
 msgstr "Post"
 
-#: calendar/gui/dialogs/delete-comp.c:68
+#: calendar/gui/dialogs/delete-comp.c:70
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:73
 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:79
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:82
 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:88
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:89
+#: calendar/gui/dialogs/delete-comp.c:91
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
@@ -1948,7 +2053,7 @@ msgid "% Comp_lete:"
 msgstr ""
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:158
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr ""
@@ -2019,300 +2124,312 @@ msgstr "Tosa�ocht"
 msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:689
+#: calendar/gui/dialogs/task-editor.c:697
 msgid "Edit Task"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
+#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
+#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "_Coinne"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
+#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:157
 msgid "Categories"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:159
 msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:160
 msgid "End Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:161
 msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:163
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:164
 msgid "Percent complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:166
 #, fuzzy
 msgid "Summary"
 msgstr "Post"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:167
 msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:168
 msgid "URL"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/e-calendar-table.c:169
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:169
+#: calendar/gui/e-calendar-table.c:170
 msgid "Click here to add a task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:374
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:375
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:376
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:377
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:378
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:379
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:380
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:381
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:382
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:383
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:384
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:550
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:551
+#: calendar/gui/e-calendar-table.c:552
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:556
+#: calendar/gui/e-calendar-table.c:557
 msgid "Edit this task..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:557
+#: calendar/gui/e-calendar-table.c:558
 #, fuzzy
 msgid "Edit the task"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:559
+#: calendar/gui/e-calendar-table.c:560
 #: ui/evolution-task-editor-dialog.xml.h:19
 #, fuzzy
 msgid "Delete this task"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:560
+#: calendar/gui/e-calendar-table.c:561
 #, fuzzy
 msgid "Delete the task"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: 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:1274
-#: calendar/gui/e-week-view-main-item.c:321
+#: 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 ""
 
 #. 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:1288
-#: calendar/gui/e-week-view-main-item.c:330
+#: 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 ""
 
 #. 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:1301
-#: calendar/gui/e-week-view-main-item.c:344
+#: 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 ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:613
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:617
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
-#: calendar/gui/print.c:612
+#: 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-day-view.c:3020 calendar/gui/e-day-view.c:3034
-#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
+#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "New Appointment..."
+msgid "New Appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
-#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: 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:3153 calendar/gui/e-week-view.c:3285
+#, fuzzy
+msgid "Go to Today"
+msgstr "S�bh�il 'san _fillte�n"
+
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#, fuzzy
+msgid "Go to Date..."
+msgstr "S�bh�il 'san _fillte�n"
+
+#: 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 "_Osc�il"
 
-#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+#: 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/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: 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:3043 calendar/gui/e-week-view.c:3251
+#: 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/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-day-view.c:3047
+#: calendar/gui/e-day-view.c:3179
 #, fuzzy
 msgid "Delete all Occurrences"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-itip-control.c:153
+#: calendar/gui/e-itip-control.c:161
 msgid "I couldn't update your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
+#: 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:165
+#: calendar/gui/e-itip-control.c:173
 msgid "There was an error loading the calendar file."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:189
+#: calendar/gui/e-itip-control.c:197
 msgid "I couldn't open your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
+#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
 msgid "I couldn't load your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:462
+#: calendar/gui/e-itip-control.c:470
 msgid "I couldn't read your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:475
+#: calendar/gui/e-itip-control.c:483
 msgid "This is a reply from someone who was uninvited!"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:491
+#: calendar/gui/e-itip-control.c:499
 msgid "I couldn't update your calendar store."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:532
+#: calendar/gui/e-itip-control.c:540
 msgid "I couldn't delete the calendar component!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:542
+#: calendar/gui/e-itip-control.c:550
 msgid "Component successfully deleted."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:694
 msgid "I don't recognize this type of calendar component."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:780
 msgid "Add to Calendar"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
+#: calendar/gui/e-itip-control.c:814
+msgid " Accept "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:815
 #, fuzzy
-msgid "Decline"
+msgid " Decline "
 msgstr "Scr�os"
 
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
+#: calendar/gui/e-itip-control.c:816
+msgid " Tentative "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:852
+#: calendar/gui/e-itip-control.c:860
 msgid "Update Calendar"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:883
 msgid "Cancel Meeting"
 msgstr ""
 
@@ -2330,7 +2447,7 @@ msgstr ""
 msgid "Calendar Message"
 msgstr "Post an sce�l seo"
 
-#: calendar/gui/e-itip-control.glade.h:5
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
 #, fuzzy
 msgid "Date:"
 msgstr "Scr�os"
@@ -2343,9 +2460,9 @@ msgstr ""
 msgid "Organizer:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
+#: calendar/gui/e-itip-control.glade.h:10
 #, fuzzy
-msgid "Sender"
+msgid "Server Message:"
 msgstr "Post"
 
 #: calendar/gui/e-itip-control.glade.h:11
@@ -2430,26 +2547,26 @@ msgid ""
 "Time"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
-#: mail/message-list.c:1171
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
+#: mail/message-list.c:1052
 msgid "Status"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
-#: calendar/gui/e-tasks.c:501
+#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
+#: calendar/gui/e-tasks.c:502
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:154
+#: calendar/gui/e-tasks.c:155
 msgid "Category:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:298
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:309
+#: calendar/gui/e-tasks.c:310
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
@@ -2457,11 +2574,16 @@ 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
+#: calendar/gui/e-week-view-main-item.c:342
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3255
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+#, fuzzy
+msgid "New Appointment..."
+msgstr "_Coinne"
+
+#: calendar/gui/e-week-view.c:3314
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Scr�os an sceal seo"
@@ -2502,7 +2624,7 @@ msgid "No recurrence"
 msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1577
+#: calendar/gui/event-editor.c:1579
 msgid "Play a sound"
 msgstr ""
 
@@ -2524,22 +2646,22 @@ msgid "Reminder"
 msgstr "Post"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1586
+#: calendar/gui/event-editor.c:1588
 msgid "Run a program"
 msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1583
+#: calendar/gui/event-editor.c:1585
 #, fuzzy
 msgid "Send an email"
 msgstr "Post"
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
+#: 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:1580
+#: calendar/gui/event-editor.c:1582
 msgid "Show a dialog"
 msgstr ""
 
@@ -2559,12 +2681,11 @@ msgstr ""
 msgid "_Starting date:"
 msgstr ""
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
 msgid "after"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
 msgid "before"
 msgstr ""
 
@@ -2589,7 +2710,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
 msgid "minute(s)"
 msgstr ""
 
@@ -2614,103 +2735,103 @@ msgstr ""
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/event-editor.c:371
+#: calendar/gui/event-editor.c:373
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/event-editor.c:449
+#: calendar/gui/event-editor.c:451
 msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
 msgid "day"
 msgstr ""
 
-#: calendar/gui/event-editor.c:601
+#: calendar/gui/event-editor.c:603
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:608
+#: calendar/gui/event-editor.c:610
 msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor.c:754
+#: calendar/gui/event-editor.c:756
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:871
+#: calendar/gui/event-editor.c:873
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1532
+#: calendar/gui/event-editor.c:1534
 #, c-format
 msgid " %d days"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1534
+#: calendar/gui/event-editor.c:1536
 msgid " 1 day"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1537
+#: calendar/gui/event-editor.c:1539
 #, c-format
 msgid " %d weeks"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1539
+#: calendar/gui/event-editor.c:1541
 msgid " 1 week"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1542
+#: calendar/gui/event-editor.c:1544
 #, c-format
 msgid " %d hours"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1544
+#: calendar/gui/event-editor.c:1546
 msgid " 1 hour"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1547
+#: calendar/gui/event-editor.c:1549
 #, c-format
 msgid " %d minutes"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1549
+#: calendar/gui/event-editor.c:1551
 msgid " 1 minute"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1552
+#: calendar/gui/event-editor.c:1554
 #, fuzzy, c-format
 msgid " %d seconds"
 msgstr "Post"
 
-#: calendar/gui/event-editor.c:1554
+#: calendar/gui/event-editor.c:1556
 #, fuzzy
 msgid " 1 second"
 msgstr "Post"
 
-#: calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1603
 #, fuzzy
 msgid " before start of appointment"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/event-editor.c:1603
+#: calendar/gui/event-editor.c:1605
 #, fuzzy
 msgid " after start of appointment"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/event-editor.c:1611
+#: calendar/gui/event-editor.c:1613
 #, fuzzy
 msgid " before end of appointment"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/event-editor.c:1615
 #, fuzzy
 msgid " after end of appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
-#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
+#: 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 ""
 
@@ -2746,12 +2867,12 @@ msgstr ""
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:695
+#: calendar/gui/gnome-cal.c:700
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:706
+#: calendar/gui/gnome-cal.c:711
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -2812,203 +2933,203 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:306
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 #, fuzzy
 msgid "Fr"
 msgstr "�:"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Sa"
 msgstr ""
 
-#: calendar/gui/print.c:944
+#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
 #, fuzzy
 msgid "Tasks"
 msgstr "_Teacs"
 
 #. Day
-#: calendar/gui/print.c:1074
+#: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1089
+#: calendar/gui/print.c:1093
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1104
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1108
+#: calendar/gui/print.c:1112
 msgid "Current month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1115
+#: calendar/gui/print.c:1119
 msgid "Current year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1152
+#: calendar/gui/print.c:1156
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:32
+#: 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
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/tasks-control.c:108
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
@@ -3040,315 +3161,456 @@ 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:790
+#: camel/camel-cipher-context.c:169
+msgid "Signing is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:207
+msgid "Clearsigning is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:245
+msgid "Verifying is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:286
+msgid "Encryption is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:326
+msgid "Decryption is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#, fuzzy
+msgid "Syncing folders"
+msgstr "Fillte�n _Nua"
+
+#: camel/camel-filter-driver.c:643
+msgid "Unable to open spool folder"
+msgstr ""
+
+#: camel/camel-filter-driver.c:652
+msgid "Unable to process spool folder"
+msgstr ""
+
+#: camel/camel-filter-driver.c:666
+#, fuzzy
+msgid "Getting message %d (%d%%)"
+msgstr "_Post sce�l"
+
+#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#, fuzzy, c-format
+msgid "Failed message %d"
+msgstr "_Post sce�l"
+
+#: camel/camel-filter-driver.c:671
+#, fuzzy
+msgid "Cannot open message"
+msgstr "_Post sce�l"
+
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Failed at message %d of %d"
+msgstr "Post an sce�l seo"
+
+#: camel/camel-filter-driver.c:866
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:795
+#: camel/camel-filter-driver.c:871
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: 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 ""
 
 #. 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 camel/camel-movemail.c:138
+#: camel/camel-movemail.c:185
 #, 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 camel/camel-movemail.c:219
 #, 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:101
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:148
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:197
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:243
+#: camel/camel-movemail.c:245
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:254
+#: camel/camel-movemail.c:256
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:274
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:304
+#: camel/camel-movemail.c:306
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:318
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:356
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:357
 msgid "(Unknown error)"
 msgstr ""
 
-#: camel/camel-provider.c:137
+#: camel/camel-movemail.c:587
+#, c-format
+msgid "Error copying mail temp file: %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:186
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:189
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr ""
+
+#: camel/camel-pgp-context.c:509
+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
+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
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:681
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:871
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:888
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1011
+msgid "No plaintext to encrypt."
+msgstr ""
+
+#: camel/camel-pgp-context.c:1037
+msgid "No recipients specified"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1227
+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:181
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:185
+#: camel/camel-remote-store.c:190
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:232
+#: camel/camel-remote-store.c:240
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:235
-#: camel/providers/smtp/camel-smtp-transport.c:244
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:261
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:236
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
-#: camel/camel-remote-store.c:448
-#: camel/providers/imap/camel-imap-command.c:289
+#: 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
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:453
+#: camel/camel-remote-store.c:464
 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:10
+#: 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:18
+#: 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:381
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:417
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:29
-msgid "PLAIN"
+#: camel/camel-sasl-plain.c:34
+msgid "This option will connect to the server using a simple password."
 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."
-msgstr ""
-
-#: camel/camel-search-private.c:105
+#: camel/camel-search-private.c:110
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:142
+#: camel/camel-service.c:152
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:151
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:168
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:512
+#: camel/camel-service.c:554
 #, c-format
-msgid "No such host %s."
+msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:515
+#: camel/camel-service.c:581
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
+msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-session.c:54
+#: camel/camel-service.c:606
+#, c-format
+msgid "Host lookup failed: %s: host not found"
+msgstr ""
+
+#: camel/camel-service.c:608
+#, c-format
+msgid "Host lookup failed: %s: unknown reason"
+msgstr ""
+
+#: camel/camel-session.c:57
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:59
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:322
+#: camel/camel-session.c:274 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:417
+#: camel/camel-session.c:462
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3356,117 +3618,140 @@ msgid ""
 msgstr ""
 
 #. Fill in the new fields
-#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
-#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#: 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
 #, fuzzy
 msgid "Trash"
 msgstr "_Teacs"
 
-#: camel/camel-url.c:77
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr ""
-
-#: camel/camel-url.c:92
+#: camel/camel-url.c:289
 #, c-format
-msgid "URL string `%s' contains an invalid protocol"
+msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-url.c:152
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr ""
+#: camel/camel-vee-folder.c:451
+#, fuzzy, c-format
+msgid "No such message %s in %s"
+msgstr "Post an sce�l seo"
 
-#: camel/camel-vee-folder.c:960
+#: camel/camel-vee-folder.c:545
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:209
 #, 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:217
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
+#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:272
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:433
+#: camel/providers/imap/camel-imap-command.c:456
 #, 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:490
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:172
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:329
+#: camel/providers/imap/camel-imap-folder.c:351
 #, fuzzy
 msgid "Scanning IMAP folder"
 msgstr "Fillte�n _Nua"
 
-#: camel/providers/imap/camel-imap-folder.c:837
-#: camel/providers/imap/camel-imap-folder.c:999
+#: camel/providers/imap/camel-imap-folder.c:986
+#: camel/providers/imap/camel-imap-folder.c:1197
+msgid "This message is not currently available"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1016
+#: camel/providers/imap/camel-imap-folder.c:1231
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+msgid "Checking for new mail"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+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
+#, fuzzy
+msgid "Folders"
+msgstr "_Fillte�n"
+
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Show only subscribed folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:59
-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:61
-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 "Freagrair"
+
+#: 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-store.c:263
+#: 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:415
+#: camel/providers/imap/camel-imap-store.c:440
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap/camel-imap-store.c:450
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:454
+#: camel/providers/imap/camel-imap-store.c:475
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:469
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:403
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:498
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: camel/providers/imap/camel-imap-store.c:518
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3474,307 +3759,321 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:772
+#: 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/local/camel-local-provider.c:36
+#: camel/providers/imap/camel-imap-store.c:1382
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:39
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:40
 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:49
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:50
 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:59
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:128
+#: camel/providers/local/camel-local-store.c:129
 #, 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:136
 #, 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:144
+#: camel/providers/local/camel-local-store.c:160
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:175
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:241
 #, 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:283
 #, 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:293
 #, 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-maildir-folder.c:150
+#: camel/providers/local/camel-maildir-folder.c:158
+#: camel/providers/local/camel-maildir-folder.c:169
 #, 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: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
 #, 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:197
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
 #, fuzzy
 msgid "No such message"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:203
 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:96
+#: 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:100
+#: 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:105
-#: camel/providers/local/camel-mh-store.c:101
+#: camel/providers/local/camel-maildir-store.c:107
+#: 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:120
+#: camel/providers/local/camel-maildir-store.c:122
 #, 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:151
+#: camel/providers/local/camel-maildir-store.c:188
+#: 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:152
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:152
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:203
 #, 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:335
+#: camel/providers/local/camel-mbox-folder.c:367
+#: camel/providers/local/camel-mbox-folder.c:380
 #, 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:368
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:381
 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:248
 #, fuzzy
 msgid "Summarising folder"
 msgstr "Fillte�n _Nua"
 
-#: camel/providers/local/camel-mbox-summary.c:245
+#: camel/providers/local/camel-mbox-summary.c:253
 #, 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:295
 #, 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:370
 #, 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:1328
+#: camel/providers/local/camel-mbox-summary.c:501
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
 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:506
+#: camel/providers/local/camel-mbox-summary.c:707
 #, 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:523
 #, 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:556
 #: camel/providers/local/camel-mbox-summary.c:745
+#: camel/providers/local/camel-mbox-summary.c:753
 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:599
 #, 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:616
 #, 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:634
+#: camel/providers/local/camel-mbox-summary.c:803
 #, 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:643
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:646
+#: camel/providers/local/camel-mbox-summary.c:654
 #, 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
 #, 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:149
+#: camel/providers/local/camel-mh-folder.c:157
 #, 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/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:66
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:72
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:81
 msgid "Server rejected username/password"
 msgstr ""
 
@@ -3798,11 +4097,11 @@ msgstr ""
 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 ""
 
@@ -3828,459 +4127,459 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:145
+#: camel/providers/pop3/camel-pop3-folder.c:149
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "_Post sce�l"
 
-#: camel/providers/pop3/camel-pop3-folder.c:188
+#: camel/providers/pop3/camel-pop3-folder.c:192
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:282
+#: camel/providers/pop3/camel-pop3-folder.c:285
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:286
+#: camel/providers/pop3/camel-pop3-folder.c:289
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "_Post sce�l"
 
-#: camel/providers/pop3/camel-pop3-folder.c:304
+#: camel/providers/pop3/camel-pop3-folder.c:307
 #, 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 "_Post sce�l"
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+#, fuzzy
+msgid "Leave messages on server"
+msgstr "_Post sce�l"
+
+#: camel/providers/pop3/camel-pop3-provider.c:41
+#, fuzzy, c-format
+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
 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:54
-msgid "Secure POP"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:56
-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-store.c:147
+#: 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:157
+#: 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:169
+#: 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:214
+#: camel/providers/pop3/camel-pop3-store.c:207
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:331
+#: camel/providers/pop3/camel-pop3-store.c:319
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:378
+#: camel/providers/pop3/camel-pop3-store.c:358
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:377
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:400
-#: camel/providers/pop3/camel-pop3-store.c:437
+#: camel/providers/pop3/camel-pop3-store.c:380
+#: camel/providers/pop3/camel-pop3-store.c:417
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:407
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:415
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Sendmail"
 msgstr "Post"
 
-#: 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 ""
 
-#: 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 ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
 msgid "SMTP"
 msgstr ""
 
-#: 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 ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:53
-msgid "Secure SMTP"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-provider.c:55
-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:147
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:175
 #, fuzzy
 msgid "Help message"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:177
 #, fuzzy
 msgid "Service ready"
 msgstr "Post"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:286
+#: camel/providers/smtp/camel-smtp-transport.c:305
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:348
 #, c-format
-msgid "%sPlease enter the SMTP password for %s@%s"
+msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:466
-msgid "No authentication required"
+#: camel/providers/smtp/camel-smtp-transport.c:388
+#, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/smtp/camel-smtp-transport.c:411
+#, c-format
 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."
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:511
+#: camel/providers/smtp/camel-smtp-transport.c:527
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:529
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:554
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:561
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:559
+#: camel/providers/smtp/camel-smtp-transport.c:575
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
-#: camel/providers/smtp/camel-smtp-transport.c:719
+#: camel/providers/smtp/camel-smtp-transport.c:721
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:736
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:777
+#: camel/providers/smtp/camel-smtp-transport.c:798
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:824
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:821
+#: camel/providers/smtp/camel-smtp-transport.c:843
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:846
+#: camel/providers/smtp/camel-smtp-transport.c:868
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:865
+#: camel/providers/smtp/camel-smtp-transport.c:887
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:896
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:915
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:930
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:952
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:967
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:1013
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1010
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1033
+#: camel/providers/smtp/camel-smtp-transport.c:1055
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1052
+#: camel/providers/smtp/camel-smtp-transport.c:1074
 #, 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:95
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:97
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytanna"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:112
 #, 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:113
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:413
+#: 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:461
+#: composer/e-msg-composer-attachment-bar.c:469
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:501
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
-#: ui/evolution-mail.xml.h:1
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
 msgid "Attachment"
 msgstr ""
 
@@ -4305,14 +4604,14 @@ msgstr ""
 msgid "Send as:"
 msgstr "Post"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:321
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
 #, fuzzy
 msgid "From:"
 msgstr "�:"
@@ -4320,7 +4619,7 @@ msgstr "�:"
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Freagrair"
@@ -4328,115 +4627,121 @@ msgstr "Freagrair"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
 msgid "Subject:"
 msgstr "Abair:"
 
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
 msgid "To:"
 msgstr "Do:"
 
-#: composer/e-msg-composer-hdrs.c:377
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:381
+#: composer/e-msg-composer-hdrs.c:388
 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:391
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:392
 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
+#: composer/e-msg-composer.c:528
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:706
+#: composer/e-msg-composer.c:716
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:717
+#: composer/e-msg-composer.c:727
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:737
+#: composer/e-msg-composer.c:747
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
+#: composer/e-msg-composer.c:819
+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:824
+#: composer/e-msg-composer.c:883
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:849
+#: composer/e-msg-composer.c:908
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:975
+#: composer/e-msg-composer.c:1034
 msgid "That file does not exist."
 msgstr ""
 
-#: composer/e-msg-composer.c:985
+#: composer/e-msg-composer.c:1044
 msgid "That is not a regular file."
 msgstr ""
 
-#: composer/e-msg-composer.c:995
+#: composer/e-msg-composer.c:1054
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:1005
+#: composer/e-msg-composer.c:1064
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:1027
+#: 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:1048
+#: composer/e-msg-composer.c:1107
 msgid "An error occurred while reading the file."
 msgstr ""
 
-#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
+#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
 #, fuzzy
 msgid "Compose a message"
 msgstr "Post an sce�l seo"
 
-#: composer/e-msg-composer.c:1765
+#: composer/e-msg-composer.c:1829
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:352
+#: 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:367
+#: composer/evolution-composer.c:370
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
@@ -4453,53 +4758,77 @@ 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:69 e-util/e-time-utils.c:117
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
 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
+#: 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:89 e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
 msgid "%H:%M:%S%n"
 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
+#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
 msgid "%I:%M %p%n"
 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
+#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
 msgid "%H:%M%n"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:267
-#: 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:269
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
 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:272
+#: e-util/e-time-utils.c:274
 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:281
+#: e-util/e-time-utils.c:283
 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 ""
@@ -4577,21 +4906,21 @@ msgstr ""
 msgid "Configure %s"
 msgstr "Fillte�n _Nua"
 
-#: executive-summary/component/e-summary.c:918
+#: executive-summary/component/e-summary.c:924
 #, c-format
 msgid ""
 "Cannot open the HTML file:\n"
 "%s"
 msgstr ""
 
-#: executive-summary/component/e-summary.c:932
+#: executive-summary/component/e-summary.c:938
 #, c-format
 msgid ""
 "Error reading data:\n"
 "%s"
 msgstr ""
 
-#: executive-summary/component/e-summary.c:950
+#: executive-summary/component/e-summary.c:956
 msgid "File does not have a place for the services.\n"
 msgstr ""
 
@@ -4603,7 +4932,7 @@ msgstr ""
 msgid "Background:"
 msgstr ""
 
-#: executive-summary/component/main.c:60
+#: 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"
@@ -4635,101 +4964,101 @@ msgstr ""
 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
+#: 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:765
+#: executive-summary/test-service/rdf-summary.c:768
 msgid "Update automatically"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:775
+#: executive-summary/test-service/rdf-summary.c:778
 msgid "Update now"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:785
+#: executive-summary/test-service/rdf-summary.c:788
 msgid "Update every "
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
+#: executive-summary/test-service/rdf-summary.c:796
+#: filter/filter-datespec.c:83
 msgid "minutes"
 msgstr ""
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "year"
 msgstr ""
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "years"
 msgstr ""
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "month"
 msgstr ""
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "months"
 msgstr ""
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "week"
 msgstr ""
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "weeks"
 msgstr ""
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:81
 msgid "days"
 msgstr ""
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hour"
 msgstr ""
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hours"
 msgstr ""
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:83
 msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 #, fuzzy
 msgid "second"
 msgstr "Post"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "seconds"
 msgstr ""
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:199
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:201
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:275
 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:298
 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:338
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -4737,126 +5066,103 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:374
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:432
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
 msgid "now"
 msgstr ""
 
-#: filter/filter-datespec.c:690
+#: filter/filter-datespec.c:706
 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:453
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:437
+#: filter/filter-filter.c:467
 msgid "Add action"
 msgstr ""
 
-#: filter/filter-filter.c:443
-#, fuzzy
-msgid "Remove action"
-msgstr "Scr�os"
-
-#: 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:279
+#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
+#: mail/mail-account-gui.c:682
 #, fuzzy
 msgid "Select Folder"
 msgstr "Fillte�n _Nua"
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:247
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:293
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:189
+#: filter/filter-input.c:194
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:467
+#: filter/filter-part.c:475
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:597
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:601
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:617
+#: filter/filter-rule.c:646
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:634
+#: filter/filter-rule.c:664
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:638
+#: filter/filter-rule.c:668
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:643
+#: filter/filter-rule.c:673
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:654
+#: filter/filter-rule.c:684
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:660
-msgid "Remove criterion"
-msgstr ""
-
-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr ""
-
-#. { N_("Deleted"), "Deleted" },
-#. { N_("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr ""
-
-#: filter/filter-system-flag.c:71
-#, fuzzy
-msgid "Read"
-msgstr "Scr�os"
-
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr ""
@@ -4874,7 +5180,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
 #, fuzzy
 msgid "Virtual Folders"
 msgstr "_Fillte�n"
@@ -4900,280 +5206,317 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr ""
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr ""
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr ""
 
+#: filter/libfilter-i18n.h:9
+#, fuzzy
+msgid "Deleted"
+msgstr "Scr�os"
+
+#: filter/libfilter-i18n.h:10
+msgid "Do Not Exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Draft"
+msgstr "Scr�os"
+
 #: filter/libfilter-i18n.h:12
-msgid "does not contain"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "does not end with"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "does not exist"
+msgid "Forward to Address"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "does not sound like"
+msgid "Important"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "does not start with"
-msgstr ""
+#, fuzzy
+msgid "Is Not"
+msgstr "_Nota"
 
 #: filter/libfilter-i18n.h:17
-msgid "Do Not Exist"
+msgid "Is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "ends with"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Exist"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "exists"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Expression"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Forward to Address"
+msgid "Message was sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "is"
-msgstr ""
+#, fuzzy
+msgid "Move to Folder"
+msgstr "Fillte�n _Nua"
 
 #: filter/libfilter-i18n.h:24
-msgid "is greater than"
-msgstr ""
+#, fuzzy
+msgid "Read"
+msgstr "Scr�os"
 
 #: filter/libfilter-i18n.h:25
-msgid "is less than"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:26
-msgid "is not"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Mailing list"
+msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
-msgid "Message Body"
+#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
+#: mail/message-list.c:1052
+msgid "Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "Message Header"
-msgstr ""
+#, fuzzy
+msgid "Sender"
+msgstr "Post"
 
 #: filter/libfilter-i18n.h:30
-msgid "Message was received"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:31
-msgid "Message was sent"
+msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-#, fuzzy
-msgid "Move to Folder"
-msgstr "Fillte�n _Nua"
-
-#: filter/libfilter-i18n.h:33
-msgid "on or after"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "on or before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:35
-msgid "Recipients"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36
-msgid "Regex Match"
-msgstr ""
+#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
+msgid "Subject"
+msgstr "Abair"
 
-#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1171
-msgid "Score"
+#: filter/libfilter-i18n.h:38
+msgid "contains"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "Set Status"
+msgid "does not contain"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "sounds like"
+msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
-msgid "Source"
+#: filter/libfilter-i18n.h:41
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "Specific header"
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
-msgid "starts with"
+msgid "does not start with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:44
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:45
-msgid "Stop Processing"
+msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
-msgid "Subject"
-msgstr "Abair"
+#: filter/libfilter-i18n.h:46
+msgid "is greater than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:47
-msgid "was after"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
+msgid "is not"
+msgstr ""
+
+#: filter/libfilter-i18n.h:49
+msgid "is"
+msgstr ""
+
+#: filter/libfilter-i18n.h:50
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:51
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:52
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:53
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:54
+msgid "was after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:55
 msgid "was before"
 msgstr ""
 
-#: filter/score-editor.c:126
+#: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr ""
 
-#: mail/component-factory.c:306
+#: mail/component-factory.c:329
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:379
+#: mail/component-factory.c:402
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:237
+#: mail/folder-browser-factory.c:209
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:219
+#: mail/folder-browser.c:225
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "Fillte�n _Nua"
 
-#: mail/folder-browser.c:509
+#: mail/folder-browser.c:533
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:512
+#: mail/folder-browser.c:536
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:515
+#: mail/folder-browser.c:539
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:518 mail/folder-browser.c:702
+#: mail/folder-browser.c:542 mail/folder-browser.c:733
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:524
+#: mail/folder-browser.c:548
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:527
+#: mail/folder-browser.c:551
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:530
+#: mail/folder-browser.c:554
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:533 mail/folder-browser.c:701
+#: mail/folder-browser.c:557 mail/folder-browser.c:732
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:544
+#: mail/folder-browser.c:568
+#, fuzzy
+msgid "Resend"
+msgstr "Post"
+
+#: mail/folder-browser.c:570
 msgid "Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:546 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Priont�il"
-
-#: mail/folder-browser.c:551
+#: mail/folder-browser.c:577
 msgid "Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
+#: 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:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
+#: 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:557
+#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
 #, fuzzy
 msgid "Forward inline"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/folder-browser.c:560
+#: mail/folder-browser.c:586
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:562
+#: mail/folder-browser.c:588
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:567
+#: mail/folder-browser.c:593
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/folder-browser.c:569
+#: mail/folder-browser.c:595
 msgid "Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:573
+#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
 #, fuzzy
 msgid "Undelete"
 msgstr "Scr�os"
@@ -5182,20 +5525,20 @@ msgstr "Scr�os"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:583
+#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:587
+#: mail/folder-browser.c:613
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:735
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:705
+#: mail/folder-browser.c:736
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
@@ -5265,64 +5608,66 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-accounts.c:116
+#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
 #, fuzzy
 msgid " (default)"
 msgstr "Scr�os"
 
-#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#: mail/mail-accounts.c:197
+msgid "Disable"
+msgstr ""
+
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+msgid "Enable"
+msgstr ""
+
+#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:423
+#: mail/mail-accounts.c:536
 msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/mail-account-editor.c:307
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
+#: 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:706
+#: mail/mail-account-editor.c:173
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-editor.c:727
-msgid "Unspecified"
-msgstr ""
-
-#: mail/mail-autofilter.c:71
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, fuzzy, c-format
 msgid "Subject is %s"
 msgstr "Abair"
 
-#: 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:357
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:85
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5330,123 +5675,139 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:150
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:202
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:227
+#: mail/mail-callbacks.c:235
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:294
-msgid "You must configure an account before you can send this email."
+#: mail/mail-callbacks.c:308
+msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:316
-msgid "You must specify recipients in order to send this message."
+#: mail/mail-callbacks.c:351
+msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:579
+#: mail/mail-callbacks.c:591
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:761
+#: mail/mail-callbacks.c:773
 msgid "Forwarded message:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:864
+#: mail/mail-callbacks.c:876
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:866
+#: mail/mail-callbacks.c:878
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1007
+#: mail/mail-callbacks.c:1019
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1056
+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?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
+#: 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:1088
+#: mail/mail-callbacks.c:1137
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1090
+#: mail/mail-callbacks.c:1139
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1204
+#: mail/mail-callbacks.c:1253
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
 #, fuzzy
 msgid "Print Message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1349
 msgid "Printing of message failed"
 msgstr ""
 
+#: mail/mail-config.c:1043 mail/mail-config.c:1046
+msgid "Connecting to server..."
+msgstr ""
+
 #: mail/mail-config.glade.h:1
-msgid "Account"
+msgid " Check for supported types "
 msgstr ""
 
 #: mail/mail-config.glade.h:2
-msgid "Account Information"
-msgstr ""
+#, fuzzy
+msgid " color"
+msgstr "_Fillte�n"
 
 #: mail/mail-config.glade.h:3
-msgid "Account Management"
+msgid "Account"
+msgstr ""
+
+#: mail/mail-config.glade.h:4
+msgid "Account Information"
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "Advanced"
+msgid "Account Management"
 msgstr ""
 
 #: mail/mail-config.glade.h:6
-msgid "Authentication"
-msgstr ""
+#, fuzzy
+msgid "Accounts"
+msgstr "_Osc�il"
 
-#: mail/mail-config.glade.h:7
-msgid "Authentication Type:"
+#: mail/mail-config.glade.h:8
+msgid "Authentication"
 msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Automatically check mail every"
+msgid "Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Check settings"
+#: mail/mail-config.glade.h:10
+msgid "Automatically check for new mail every"
 msgstr ""
 
 #: mail/mail-config.glade.h:12
@@ -5459,796 +5820,767 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "De_fault"
 msgstr "Scr�os"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Done"
 msgstr "_Nota"
 
-#: mail/mail-config.glade.h:23
-msgid "Email Address:"
-msgstr ""
+#: mail/mail-config.glade.h:21
+#, fuzzy
+msgid "Drafts"
+msgstr "Scr�os"
 
-#: mail/mail-config.glade.h:24
-msgid "Email address:"
+#: mail/mail-config.glade.h:22
+msgid "Drafts folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
-msgid "Evolution Mail Configuration"
+#: mail/mail-config.glade.h:24
+msgid "Email Address:"
 msgstr ""
 
 #: mail/mail-config.glade.h:26
 msgid "Full Name:"
 msgstr ""
 
+#: mail/mail-config.glade.h:27
+msgid "Highlight citations with "
+msgstr ""
+
 #: mail/mail-config.glade.h:29
-msgid "Hostname:"
+msgid "IMAPv4 "
 msgstr ""
 
 #: mail/mail-config.glade.h:30
-msgid "IMAP"
+msgid "Identity"
 msgstr ""
 
 #: mail/mail-config.glade.h:31
-msgid "Identity"
-msgstr ""
+#, fuzzy
+msgid "Kerberos "
+msgstr "Post"
 
 #: mail/mail-config.glade.h:32
-msgid "Include this account when receiving mail"
+msgid "Mail Configuration"
 msgstr ""
 
 #: mail/mail-config.glade.h:33
-msgid "Keep mail on server"
+msgid "Make this my default account"
 msgstr ""
 
 #: mail/mail-config.glade.h:34
-#, fuzzy
-msgid "Kerberos"
-msgstr "Post"
-
-#: mail/mail-config.glade.h:35
-#, fuzzy
-msgid "Mail"
-msgstr "Post"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail Account"
+msgid "Mark messages as \"Read\" after:"
 msgstr ""
 
-#: mail/mail-config.glade.h:37
-msgid "Mail Configuration"
-msgstr ""
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "News"
+msgstr "_Nua"
 
 #: mail/mail-config.glade.h:38
-msgid "Mail Configuration Druid"
+msgid "Optional Information"
 msgstr ""
 
 #: mail/mail-config.glade.h:39
-msgid "Make this my default account"
+msgid "Organization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:41
+msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
-#, fuzzy
-msgid "News"
-msgstr "_Nua"
-
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
-msgid "Optional"
-msgstr "_Osc�il"
-
-#: mail/mail-config.glade.h:45
-msgid "Organization:"
-msgstr ""
+msgid "Qmail maildir "
+msgstr "Post"
 
 #: mail/mail-config.glade.h:47
-msgid "PGP binary path:"
+msgid "Receiving Email"
 msgstr ""
 
 #: mail/mail-config.glade.h:48
-msgid "Password:"
+msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
-msgid "Plain Text"
+#: mail/mail-config.glade.h:49
+msgid "Receiving Options"
 msgstr ""
 
 #: mail/mail-config.glade.h:51
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config.glade.h:52
-msgid "Remember my password"
+msgid "Required Information"
 msgstr ""
 
 #: mail/mail-config.glade.h:53
-msgid "Reply address:"
+msgid "Select PGP binary"
 msgstr ""
 
 #: mail/mail-config.glade.h:54
-msgid "Required"
+msgid "Send mail in HTML format by default."
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Save password"
-msgstr ""
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Sending Email"
+msgstr "Post"
 
-#: mail/mail-config.glade.h:57
-msgid "Select PGP binary"
-msgstr ""
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Post"
 
 #: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Select signature file"
-msgstr "Fillte�n _Nua"
+msgid "Sent"
+msgstr "Post"
 
 #: mail/mail-config.glade.h:59
-msgid "Send mail in HTML format by default."
-msgstr ""
+#, fuzzy
+msgid "Sent and Draft Messages"
+msgstr "Post an sce�l seo"
 
 #: mail/mail-config.glade.h:60
 #, fuzzy
-msgid "Sending Email"
-msgstr "Post"
+msgid "Sent messages folder:"
+msgstr "_Post sce�l"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:61
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Server Type: "
 msgstr "Post"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
-#, fuzzy
-msgid "Server type:"
-msgstr "Post"
-
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
-msgid "Signature:"
-msgstr ""
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:65
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
-msgid "This server requires a secure connection (SSL)"
-msgstr ""
-
-#: mail/mail-config.glade.h:71
-msgid "Transport"
-msgstr ""
+#: mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Special Folders"
+msgstr "_Fillte�n"
 
-#: mail/mail-config.glade.h:72
-msgid "Transport Authentication"
+#: mail/mail-config.glade.h:67
+msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:68
 msgid "Type"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
-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:75
-msgid "User Information"
+#: mail/mail-config.glade.h:69
+msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:70
 msgid "Username:"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:71
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: 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:28
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
 msgid "_Edit"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
-msgid "minutes."
+#: 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:421
-#, c-format
+#: mail/mail-config-druid.c:101
 msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+"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:515
-msgid "Namespace:"
+#: 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:708
-#, c-format
+#: mail/mail-config-druid.c:107
 msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+"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:1215
+#: mail/mail-config-druid.c:445
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-display.c:189
+#: mail/mail-display.c:194
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:229
+#: mail/mail-display.c:234
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/mail-display.c:290
+#: mail/mail-display.c:295
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:292
+#: mail/mail-display.c:297
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:294
+#: mail/mail-display.c:299
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:323
+#: mail/mail-display.c:334
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:346
+#: mail/mail-display.c:357
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:361
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-format.c:506
+#: mail/mail-display.c:1102
+msgid "Open link in browser"
+msgstr ""
+
+#: mail/mail-display.c:1104
+#, fuzzy
+msgid "Save as (FIXME)"
+msgstr "_Post sce�l"
+
+#: mail/mail-display.c:1106
+#, fuzzy
+msgid "Copy location (FIXME)"
+msgstr "_Coinne"
+
+#: mail/mail-format.c:518
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:704
+#: mail/mail-format.c:560
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+
+#: mail/mail-format.c:742
 #, fuzzy
 msgid "Loading message content"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-format.c:993
+#: mail/mail-format.c:1046
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:999
+#: mail/mail-format.c:1052
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-format.c:1000
+#: mail/mail-format.c:1053
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1069 mail/mail-format.c:1456
+#: mail/mail-format.c:1137 mail/mail-format.c:1526
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1077 mail/mail-format.c:1464
+#: mail/mail-format.c:1145 mail/mail-format.c:1534
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1677
+#: mail/mail-format.c:1747
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1689
+#: mail/mail-format.c:1759
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1693
+#: mail/mail-format.c:1763
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1727
+#: mail/mail-format.c:1797
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1732
+#: mail/mail-format.c:1802
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:335
+#: mail/mail-local.c:337
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-local.c:508
+#: mail/mail-local.c:509
 #, c-format
 msgid "Opening '%s'"
 msgstr ""
 
-#: mail/mail-local.c:786
+#: mail/mail-local.c:787
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:790
+#: mail/mail-local.c:791
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:815
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Fillte�n _Nua"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:843
+#: mail/mail-local.c:844
 msgid "Closing current folder"
 msgstr ""
 
-#: mail/mail-local.c:875
+#: mail/mail-local.c:876
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:893
+#: mail/mail-local.c:894
 msgid "Creating new folder"
 msgstr ""
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:908
 #, fuzzy
 msgid "Copying messages"
 msgstr "_Post sce�l"
 
-#: mail/mail-local.c:928
+#: mail/mail-local.c:925
 #, 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:964
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:177
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:179
+#: mail/mail-mt.c:192
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
+#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
 msgid "Working"
 msgstr ""
 
-#: mail/mail-mt.c:666 mail/session.c:91
+#: mail/mail-mt.c:679 mail/session.c:98
 msgid "Do you accept?"
 msgstr ""
 
-#: mail/mail-mt.c:860
+#: mail/mail-mt.c:873
 #, fuzzy
 msgid "Evolution progress"
 msgstr "Evolution"
 
-#: mail/mail-ops.c:516
+#: mail/mail-ops.c:587
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:518
+#: mail/mail-ops.c:589
 #, fuzzy
 msgid "Sending message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:704
+#, fuzzy, c-format
+msgid "Sending message %d of %d"
+msgstr "Post an sce�l seo"
+
+#: mail/mail-ops.c:723
+#, 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
+msgid "Complete."
+msgstr ""
+
+#: mail/mail-ops.c:811
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:842
+#: mail/mail-ops.c:900
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:903
 #, fuzzy
 msgid "Copying"
 msgstr "Greamaigh"
 
-#: mail/mail-ops.c:856
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:978
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1085
+#: mail/mail-ops.c:1139
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
+#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1193
+#: mail/mail-ops.c:1247
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1380
+#: mail/mail-ops.c:1434
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1429
+#: mail/mail-ops.c:1483
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:1496
+#: mail/mail-ops.c:1550
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1560
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1580
+#: mail/mail-ops.c:1634
 #, fuzzy
 msgid "Saving messages"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:1659
+#: mail/mail-ops.c:1713
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1672
+#: mail/mail-ops.c:1726
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1686
+#: mail/mail-ops.c:1740
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1760
+#: mail/mail-ops.c:1814
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1829
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1857
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:107
+#: mail/mail-search-dialogue.c:113
 #, fuzzy
 msgid "_Search"
 msgstr "_Fillte�n"
 
-#: mail/mail-send-recv.c:136
+#: mail/mail-send-recv.c:138
 msgid "Cancelling ..."
 msgstr ""
 
-#: mail/mail-send-recv.c:231
+#: mail/mail-send-recv.c:233
 msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:234
+#: mail/mail-send-recv.c:236
 msgid "Receiving"
 msgstr ""
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:285
 msgid "Updating ..."
 msgstr ""
 
-#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+#: 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:306
 #, fuzzy
 msgid "Sending"
 msgstr "Post"
 
-#: mail/mail-send-recv.c:469
+#: mail/mail-send-recv.c:471
 msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-send-recv.c:473
-msgid "Complete."
-msgstr ""
-
-#: mail/mail-summary.c:111
+#: mail/mail-summary.c:109
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-tools.c:138
+#: mail/mail-tools.c:141
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:185
+#: mail/mail-tools.c:188
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr ""
 
-#: mail/mail-tools.c:195
+#: mail/mail-tools.c:198
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:212
+#: mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:214
+#: mail/mail-tools.c:217
 msgid "Forwarded message (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:411
+#: 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-vfolder.c:248
+#: mail/mail-vfolder.c:249
 #, fuzzy
 msgid "VFolders"
 msgstr "_Fillte�n"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:427
 #, 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:138 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
 msgid "Reply"
 msgstr "Freagrair"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
 msgid "Reply to the sender of this message"
 msgstr ""
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
 msgid "Reply to all recipients of this message"
 msgstr ""
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
 msgid "Forward this message"
 msgstr ""
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
+#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
 msgid "Print the selected message"
 msgstr ""
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
+#: 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:618
+#: mail/message-list.c:648
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:621
+#: mail/message-list.c:649
 #, fuzzy
 msgid "Seen"
 msgstr "Post"
 
-#: mail/message-list.c:624
+#: mail/message-list.c:650
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:627
+#: mail/message-list.c:651
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:630
+#: mail/message-list.c:652
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Post an sce�l seo"
 
-#: mail/message-list.c:952
-#, c-format
-msgid "[ %s ]"
+#: mail/message-list.c:656
+msgid "Lowest"
 msgstr ""
 
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:964 mail/message-list.c:980
-#, c-format
-msgid "%s, et al."
+#: mail/message-list.c:657
+msgid "Lower"
+msgstr ""
+
+#: mail/message-list.c:661
+msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:967 mail/message-list.c:983
-msgid "<unknown>"
+#: mail/message-list.c:662
+msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1035
+#: mail/message-list.c:912
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1042
+#: mail/message-list.c:919
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1051
+#: mail/message-list.c:928
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1063
+#: mail/message-list.c:940
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1071
+#: mail/message-list.c:948
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1073
+#: mail/message-list.c:950
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:1171
+#: mail/message-list.c:1052
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "From"
 msgstr "�:"
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "Date"
 msgstr "Scr�os"
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.c:1173
+#: mail/message-list.c:1054
 #, fuzzy
 msgid "To"
 msgstr "Do:"
 
-#: mail/message-list.c:1173
+#: mail/message-list.c:1054
 #, fuzzy
 msgid "Size"
 msgstr "M�id"
 
-#: mail/openpgp-utils.c:89
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:92
-#, c-format
-msgid "Please enter your %s passphrase"
-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 ""
-
-#: 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 ""
-
-#: 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"
-msgstr ""
-
-#: mail/openpgp-utils.c:588
-msgid "No recipients specified"
-msgstr ""
-
-#: mail/openpgp-utils.c:1088
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr ""
-
-#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
 #, fuzzy
 msgid "Folder"
 msgstr "_Fillte�n"
 
-#: mail/subscribe-dialog.c:65
+#: mail/subscribe-dialog.c:77
 msgid "Store"
 msgstr ""
 
-#: mail/subscribe-dialog.c:147
+#: mail/subscribe-dialog.c:138
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:177
+#: mail/subscribe-dialog.c:168
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:280
+#: mail/subscribe-dialog.c:271
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:273
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
+#. Construct the app
+#: mail/subscribe-dialog.c:873
+msgid "Manage Subscriptions"
+msgstr ""
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #, fuzzy
 msgid "Folder name:"
@@ -6263,9 +6595,18 @@ msgstr "_Fillte�n"
 msgid "Specify where to create the folder:"
 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:157
+#: shell/importer/importer.c:182
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6273,74 +6614,70 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/importer/importer.c:175 shell/importer/importer.c:202
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/importer/importer.c:309
+#: shell/importer/importer.c:341
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/importer/importer.c:319
+#: shell/importer/importer.c:351
 msgid "Importing"
 msgstr ""
 
-#: shell/importer/importer.c:327
+#: shell/importer/importer.c:359
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/importer/importer.c:342
+#: shell/importer/importer.c:372
+#, c-format
+msgid "Error starting %s"
+msgstr ""
+
+#: shell/importer/importer.c:387
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/importer/importer.c:357
+#: shell/importer/importer.c:402
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/importer/importer.c:428
+#: shell/importer/importer.c:473
 msgid "Automatic"
 msgstr ""
 
-#: shell/importer/importer.c:478
+#: shell/importer/importer.c:523
 #, fuzzy
 msgid "Filename:"
 msgstr "_Fillte�n"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
 #, fuzzy
 msgid "Select a file"
 msgstr "Fillte�n _Nua"
 
-#: shell/importer/importer.c:493
+#: shell/importer/importer.c:538
 msgid "File type:"
 msgstr ""
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
 msgid "Import"
 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."
-msgstr ""
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -6360,37 +6697,37 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: shell/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:122
 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:123
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:157
+#: shell/e-setup.c:163
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
+#: shell/e-setup.c:166 shell/e-setup.c:234
 msgid "Evolution files successfully installed."
 msgstr ""
 
-#: shell/e-setup.c:189
+#: shell/e-setup.c:195
 msgid "This seems to be the first time you are running Evolution."
 msgstr ""
 
-#: shell/e-setup.c:190
+#: shell/e-setup.c:196
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:215
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6398,14 +6735,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:224
+#: shell/e-setup.c:230
 #, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:255
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6413,7 +6750,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:267
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6421,18 +6758,18 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:96
+#: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:153
+#: shell/e-shell-folder-creation-dialog.c:156
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:245
+#: shell/e-shell-folder-creation-dialog.c:248
 msgid "Evolution - Create new folder"
 msgstr ""
 
@@ -6442,153 +6779,148 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:318
+#: shell/e-shell-folder-selection-dialog.c:319
 #, fuzzy
 msgid "New..."
 msgstr "_Nua"
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:159
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:179
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:194
+#: shell/e-shell-view-menu.c:208
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:196
+#: shell/e-shell-view-menu.c:210
 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:360
+#: shell/e-shell-view-menu.c:374
 #, fuzzy
 msgid "Go to folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: shell/e-shell-view.c:143
+#: shell/e-shell-view.c:148
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:474
-#, fuzzy
-msgid "Folders"
-msgstr "_Fillte�n"
-
-#: shell/e-shell-view.c:1124
+#: shell/e-shell-view.c:1134
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evolution"
 
-#: shell/e-shell-view.c:1126
+#: shell/e-shell-view.c:1136
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evolution"
 
-#: shell/e-shell.c:372
+#: shell/e-shell.c:378
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1242
+#: shell/e-shell.c:1248
 #, 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:134
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:137
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:260
 #, 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:265
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:276
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:277
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:279
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:280
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:291
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:292
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:294
 msgid "_Remove This Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:295
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:300
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:301
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:388
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:375
+#: shell/e-shortcuts.c:379
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: 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:42
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
 #, fuzzy
 msgid "_View"
 msgstr "_Nua"
 
-#: shell/e-storage-set-view.c:468
+#: shell/e-storage-set-view.c:649
 msgid "View the selected folder"
 msgstr ""
 
@@ -6596,47 +6928,47 @@ msgstr ""
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:429
+#: shell/e-storage.c:459
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:431
+#: shell/e-storage.c:461
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:433
+#: shell/e-storage.c:463
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:435
+#: shell/e-storage.c:465
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:437
+#: shell/e-storage.c:467
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:439
+#: shell/e-storage.c:469
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:441
+#: shell/e-storage.c:471
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:443
+#: shell/e-storage.c:473
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:445
+#: shell/e-storage.c:475
 msgid "Permission denied"
 msgstr ""
 
-#: shell/e-storage.c:447
+#: shell/e-storage.c:477
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:449
+#: shell/e-storage.c:479
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
@@ -6647,7 +6979,7 @@ msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:73
+#: shell/main.c:83
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -6668,7 +7000,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:98
+#: shell/main.c:108
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6676,15 +7008,19 @@ msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:129
+#: shell/main.c:139
 msgid "Cannot initialize the Evolution shell."
 msgstr ""
 
-#: shell/main.c:175
-msgid "Disable."
+#: shell/main.c:185
+msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:195
+#: shell/main.c:186
+msgid "Send the debugging output of all components to a file."
+msgstr ""
+
+#: shell/main.c:219
 msgid "Cannot initialize the Bonobo component system."
 msgstr ""
 
@@ -6710,8 +7046,7 @@ msgstr ""
 msgid "New contact"
 msgstr "_Coinne"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
 #, fuzzy
 msgid "Previews the message to be printed"
 msgstr "Post an sce�l seo"
@@ -6720,7 +7055,7 @@ msgstr "Post an sce�l seo"
 msgid "Print contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
 msgid "Stop"
 msgstr ""
 
@@ -6745,7 +7080,7 @@ msgstr ""
 msgid "_Contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
 #: ui/evolution-contact-editor.xml.h:15
 #, fuzzy
 msgid "_Print..."
@@ -6755,9 +7090,9 @@ msgstr "Priont�il"
 msgid "_Search for contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
+#: 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"
 msgstr "_Uirlis�"
 
@@ -6771,123 +7106,157 @@ msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a new appointment"
+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"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution-calendar.xml.h:6
 msgid "Create a new calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Go To"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Go back in time"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 #, fuzzy
 msgid "Go forward in time"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
+msgid "Go to _Date"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:12
+msgid "Go to _Today"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to present time"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:15
 #, fuzzy
 msgid "Month"
 msgstr "Priont�il"
 
-#: ui/evolution-calendar.xml.h:13
-#, fuzzy
-msgid "New Appointment"
-msgstr "_Coinne"
+#: ui/evolution-calendar.xml.h:17
+msgid "New _Event"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
+#: 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:16
+#: ui/evolution-calendar.xml.h:20
 msgid "Open Calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:21
 msgid "Prev"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Previews the calendar to be printed"
+msgstr "Post an sce�l seo"
+
+#: ui/evolution-calendar.xml.h:25
 msgid "Print calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 msgid "Print this Calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
+#: 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:24
+#: ui/evolution-calendar.xml.h:28
 msgid "Save calendar as something else"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show 1 day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show 1 month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show 1 week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
-#: widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
+#: widgets/misc/e-dateedit.c:422
 msgid "Today"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:35
+msgid "W_ork Week"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
 #, fuzzy
 msgid "_Appointment"
 msgstr "_Coinne"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
+#: ui/evolution-calendar.xml.h:38
+msgid "_Day"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:39
+#, fuzzy
+msgid "_Month"
+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-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:41
 msgid "_Open Calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: 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-calendar.xml.h:45
+msgid "_Week"
+msgstr ""
+
 #: ui/evolution-contact-editor.xml.h:2
 #, fuzzy
 msgid "Delete this item"
@@ -6914,7 +7283,7 @@ 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:35 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
 #, fuzzy
 msgid "Print..."
 msgstr "Priont�il"
@@ -6950,7 +7319,7 @@ 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:29
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
 #, fuzzy
 msgid "_File"
 msgstr "_Fillte�n"
@@ -7013,7 +7382,7 @@ msgstr "Scr�os an sceal seo"
 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:4
+#: 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"
@@ -7109,7 +7478,7 @@ msgid "Print Setup"
 msgstr "Priont�il"
 
 #: 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
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr ""
 
@@ -7130,7 +7499,8 @@ msgstr ""
 msgid "Schedule some sort of a meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:68
+#: ui/evolution-task-editor-dialog.xml.h:57
 #, fuzzy
 msgid "Select All"
 msgstr "Fillte�n _Nua"
@@ -7155,12 +7525,12 @@ 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:26
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
 msgid "_Close"
 msgstr ""
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "_Contact (FIXME)"
 msgstr "_Coinne"
@@ -7176,7 +7546,7 @@ msgid "_Debug"
 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:33
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Help"
 msgstr "_Nota"
@@ -7222,7 +7592,7 @@ msgstr "Priont�il"
 msgid "_Print"
 msgstr "Priont�il"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
 #: ui/evolution-task-editor-dialog.xml.h:83
 #, fuzzy
 msgid "_Properties..."
@@ -7234,7 +7604,7 @@ 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:40
+#: ui/evolution.xml.h:41
 #, fuzzy
 msgid "_Task (FIXME)"
 msgstr "_Post sce�l"
@@ -7265,254 +7635,386 @@ msgid "New Mail"
 msgstr ""
 
 #: ui/evolution-mail.xml.h:2
-msgid "Compose"
+msgid "Apply any new filters to the mail in this box"
 msgstr ""
 
 #: ui/evolution-mail.xml.h:3
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:4
+msgid "Compose"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:5
 #, fuzzy
 msgid "Compose a new message"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Configure Folder..."
+msgstr "S�bh�il 'san _fillte�n"
+
+#: ui/evolution-mail.xml.h:8
 msgid "Copy message to a new folder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail.xml.h:9
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Fillte�n _Nua"
+
+#: ui/evolution-mail.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Delete the selected messages"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Display all of the message headers"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:10
-msgid "Empty Trash"
+#: ui/evolution-mail.xml.h:15
+#, fuzzy
+msgid "Edit Message"
+msgstr "_Post sce�l"
+
+#: ui/evolution-mail.xml.h:16
+msgid "Edit the current message"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:17
+msgid "Empty _Trash"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:18
+msgid "Expunge"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:19
 msgid "Filter on Se_nder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:20
 msgid "Filter on _Recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:21
 #, fuzzy
 msgid "Filter on _Subject"
 msgstr "Abair"
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:22
+msgid "Finaly remove all mails tagged for deletion"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:23
 msgid "Forget _Passwords"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:25
 #, fuzzy
 msgid "Forward As"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:27
+msgid "Forward the selected mail to someone"
+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.xml.h:30
 #, fuzzy
-msgid "Full Headers"
+msgid "Full _Headers"
 msgstr "_Fillte�n"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:31
+#, fuzzy
+msgid "Hide Deleted Messages"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution-mail.xml.h:32
 #, fuzzy
 msgid "Hide S_elected Messages"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:33
 #, fuzzy
 msgid "Hide _Deleted Messages"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:34
 #, fuzzy
 msgid "Hide _Read messages"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Inline"
+#: ui/evolution-mail.xml.h:35
+msgid "Invert Selection"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:36
 msgid "Manage _Subscriptions..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:37
 msgid "Mar_k as Read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:38
 msgid "Mark All as R_ead"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:39
+msgid "Mark As Read"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:40
+msgid "Mark As U_nread"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:41
 msgid "Mark as U_nread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:27
-msgid "Message _Display"
+#: ui/evolution-mail.xml.h:42
+msgid "Mark the selected messages as having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:43
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:44
 #, fuzzy
 msgid "Move"
 msgstr "Scr�os"
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:45
 #, fuzzy
 msgid "Move message to a new folder"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:46
+#, fuzzy
+msgid "Move selected messages to another folder"
+msgstr "Fillte�n _Nua"
+
+#: ui/evolution-mail.xml.h:47
+msgid "Open in New Window"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Open the current message in a new window"
+msgstr "Post an sce�l seo"
+
+#: ui/evolution-mail.xml.h:53
+#, fuzzy
+msgid "Print Preview of message..."
+msgstr "Post an sce�l seo"
+
+#: ui/evolution-mail.xml.h:54
 msgid "Print message to the printer"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:55
 #, fuzzy
-msgid "Quoted"
-msgstr "_Nota"
+msgid "Print message..."
+msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:58
 msgid "Redirect (FIXME: implement me)"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:61
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Freagrair"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:62
+#, fuzzy
+msgid "Reply to all"
+msgstr "Freagrair"
+
+#: ui/evolution-mail.xml.h:64
+#, fuzzy
+msgid "Reply to sender"
+msgstr "Freagrair"
+
+#: ui/evolution-mail.xml.h:66
 msgid "S_ource"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "Save the message into a new file"
+msgstr "Post an sce�l seo"
+
+#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
 #, fuzzy
 msgid "Select _All"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:70
 msgid "Select _Thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:46
-msgid "Send and Receive"
+#: ui/evolution-mail.xml.h:71
+msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:72
+msgid "Send a reply to the person who sent you this mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:73
+msgid "Send a single mail in reply to all the selected mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:74
+msgid ""
+"Send queued mail\n"
+"    and retrieve new mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:76
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:77
 #, fuzzy
 msgid "Show _All"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:79
 #, fuzzy
 msgid "Threaded Message list"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:80
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution-mail.xml.h:82
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:83
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:84
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Abair"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:85
 msgid "View Raw Message Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:86
 msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:56
-#, fuzzy
-msgid "_Actions"
-msgstr "_Osc�il"
-
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:87
 msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:88
 #, fuzzy
-msgid "_Compose"
-msgstr "_Nota"
+msgid "_Attachment"
+msgstr "_Coinne"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:89
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Fillte�n"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:90
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:92
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:93
 #, fuzzy
 msgid "_Filters..."
 msgstr "_Fillte�n"
 
-#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
 msgid "_Folder"
 msgstr "_Fillte�n"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:95
 #, fuzzy
 msgid "_Forward"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
+#: 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:67
+#: ui/evolution-mail.xml.h:98
 #, fuzzy
 msgid "_Mail Message"
 msgstr "_Post sce�l"
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:99
 msgid "_Mail Settings..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:69
-#, fuzzy
-msgid "_Message Hiding"
-msgstr "_Post sce�l"
-
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail.xml.h:100
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail.xml.h:101
 #, fuzzy
 msgid "_Open Selected Items"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail.xml.h:74
-msgid "_Send and Receive"
+#: ui/evolution-mail.xml.h:103
+#, fuzzy
+msgid "_Quoted"
+msgstr "_Nota"
+
+#: ui/evolution-mail.xml.h:104
+#, fuzzy
+msgid "_Reply"
+msgstr "Freagrair"
+
+#: ui/evolution-mail.xml.h:105
+#, fuzzy
+msgid "_Resend Messages"
+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.xml.h:108
+msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail.xml.h:109
 msgid "_Threaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:111
 #, fuzzy
 msgid "_Undelete"
 msgstr "Scr�os"
@@ -7779,7 +8281,7 @@ msgstr "Leas�"
 msgid "Undo the last action"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
 #, fuzzy
 msgid "_Appointment (FIXME)"
 msgstr "_Coinne"
@@ -7910,123 +8412,136 @@ msgstr ""
 msgid "_About Evolution..."
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "_Actions"
+msgstr "_Osc�il"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Fillte�n"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "_Fillte�n"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Import file..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:36
 msgid "_Index"
 msgstr ""
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:37
 #, fuzzy
 msgid "_Mail message"
 msgstr "_Post sce�l"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_New Folder"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:40
 msgid "_Shortcut Bar"
 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:2475
 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:390
+msgid "Tentative"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
 msgid "_Invite Others..."
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
 #, fuzzy
 msgid "_Options"
 msgstr "_Osc�il"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
 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:459
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
 msgid "_<<"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
 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:556
 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:569
 msgid "_Required People"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
 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:605
 msgid "Meeting _start time:"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
 msgid "Meeting _end time:"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
 msgid "All Attendees"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:171
+#: widgets/menus/gal-view-menus.c:177
 msgid "_Current View"
 msgstr ""
 
+#: widgets/menus/gal-view-menus.c:196
+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
@@ -8038,90 +8553,98 @@ msgstr ""
 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:218 widgets/misc/e-dateedit.c:416
 msgid "Now"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:239
+#: widgets/misc/e-cell-date-edit.c:242
 msgid "OK"
 msgstr ""
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
-#: 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.
-#.
-#: widgets/misc/e-cell-date-edit.c:460
-msgid "%H:%M:%S"
-msgstr ""
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
-#: 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.
-#.
-#: widgets/misc/e-cell-date-edit.c:469
-msgid "%I:%M:%S %p"
-msgstr ""
-
-#. FIXME: Better message needed.
-#: widgets/misc/e-cell-date-edit.c:736
-msgid "The time is invalid"
+#: widgets/misc/e-cell-date-edit.c:723
+#, c-format
+msgid "The time must be in the format: %s"
 msgstr ""
 
 #: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:160
+#: widgets/misc/e-filter-bar.c:166
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:311
+#: widgets/misc/e-filter-bar.c:317
 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:173
 msgid "Question"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:169
+#: widgets/misc/e-messagebox.c:180
 #, fuzzy
 msgid "Message"
 msgstr "_Post sce�l"
 
 #. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
+#: 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:140
+#: widgets/misc/e-search-bar.c:148
 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 "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 ""
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr ""
@@ -8130,19 +8653,39 @@ msgstr ""
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:153
+#: wombat/wombat.c:173
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr ""
 
-#: wombat/wombat.c:165
+#: wombat/wombat.c:185
 msgid "init_corba(): could not initialize GNOME"
 msgstr ""
 
-#: wombat/wombat.c:178
+#: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Remove action"
+#~ msgstr "Scr�os"
+
+#, fuzzy
+#~ msgid "Mail"
+#~ msgstr "Post"
+
+#, fuzzy
+#~ msgid "Optional"
+#~ msgstr "_Osc�il"
+
+#, fuzzy
+#~ msgid "Select signature file"
+#~ msgstr "Fillte�n _Nua"
+
+#, fuzzy
+#~ msgid "_Message Hiding"
+#~ msgstr "_Post sce�l"
+
+#, fuzzy
 #~ msgid "New"
 #~ msgstr "_Nua"
 
@@ -8207,10 +8750,6 @@ msgstr ""
 #~ msgstr "Leas�"
 
 #, fuzzy
-#~ msgid "_Edit Message"
-#~ msgstr "_Post sce�l"
-
-#, fuzzy
 #~ msgid "_Print Message"
 #~ msgstr "_Post sce�l"
 
diff --git a/po/gl.po b/po/gl.po
index aae4a510ce..3e7f49d087 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-03-15 11:05+0100\n"
+"POT-Creation-Date: 2001-04-14 08:51-0400\n"
 "PO-Revision-Date: 2000-08-26 00:59+0200\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3209
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3211
 msgid ""
 "\n"
 "Name: "
@@ -30,7 +30,7 @@ msgstr ""
 "\n"
 "Nome: "
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3212
 msgid ""
 "\n"
 "  Prefix:     "
@@ -38,25 +38,25 @@ msgstr ""
 "\n"
 "  Prefixo:    "
 
-#: addressbook/backend/ebook/e-card.c:3057
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3058
+#: addressbook/backend/ebook/e-card.c:3214
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3059
+#: addressbook/backend/ebook/e-card.c:3215
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3060
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "  Suffix:     "
@@ -64,7 +64,7 @@ msgstr ""
 "\n"
 "  Sufixo:     "
 
-#: addressbook/backend/ebook/e-card.c:3074
+#: addressbook/backend/ebook/e-card.c:3230
 msgid ""
 "\n"
 "Birth Date: "
@@ -72,7 +72,7 @@ msgstr ""
 "\n"
 "Data de Nacemento: "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3241
 msgid ""
 "\n"
 "Address:"
@@ -80,7 +80,7 @@ msgstr ""
 "\n"
 "Enderezo:"
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3243
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -88,13 +88,13 @@ msgstr ""
 "\n"
 "  Apdo. de Correos: "
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3244
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3245
 msgid ""
 "\n"
 "  Street:      "
@@ -102,7 +102,7 @@ msgstr ""
 "\n"
 "  R�a:         "
 
-#: addressbook/backend/ebook/e-card.c:3090
+#: addressbook/backend/ebook/e-card.c:3246
 msgid ""
 "\n"
 "  City:        "
@@ -110,7 +110,7 @@ msgstr ""
 "\n"
 "  Cidade:      "
 
-#: addressbook/backend/ebook/e-card.c:3091
+#: addressbook/backend/ebook/e-card.c:3247
 msgid ""
 "\n"
 "  Region:      "
@@ -118,7 +118,7 @@ msgstr ""
 "\n"
 "  Rexi�n:      "
 
-#: addressbook/backend/ebook/e-card.c:3092
+#: addressbook/backend/ebook/e-card.c:3248
 msgid ""
 "\n"
 "  Postal Code: "
@@ -126,7 +126,7 @@ msgstr ""
 "\n"
 "  C�digo Postal: "
 
-#: addressbook/backend/ebook/e-card.c:3093
+#: addressbook/backend/ebook/e-card.c:3249
 msgid ""
 "\n"
 "  Country:     "
@@ -134,13 +134,13 @@ msgstr ""
 "\n"
 "  Pa�s:        "
 
-#: addressbook/backend/ebook/e-card.c:3106
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3118
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "Telephones:\n"
@@ -148,7 +148,7 @@ msgstr ""
 "\n"
 "Tel�fonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3121
+#: addressbook/backend/ebook/e-card.c:3277
 msgid ""
 "\n"
 "Telephone:"
@@ -156,7 +156,7 @@ msgstr ""
 "\n"
 "Tel�fono:"
 
-#: addressbook/backend/ebook/e-card.c:3145
+#: addressbook/backend/ebook/e-card.c:3301
 msgid ""
 "\n"
 "E-mail:\n"
@@ -164,7 +164,7 @@ msgstr ""
 "\n"
 "Correo Electr�nico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3148
+#: addressbook/backend/ebook/e-card.c:3304
 msgid ""
 "\n"
 "E-mail:"
@@ -172,13 +172,13 @@ msgstr ""
 "\n"
 "Correo Electr�nico:"
 
-#: addressbook/backend/ebook/e-card.c:3167
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3173
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "Time Zone: "
@@ -186,25 +186,25 @@ msgstr ""
 "\n"
 "Zona Horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3185
+#: addressbook/backend/ebook/e-card.c:3341
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Name:  "
@@ -212,31 +212,31 @@ msgstr ""
 "\n"
 "  Nome:  "
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3355
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3201
+#: addressbook/backend/ebook/e-card.c:3357
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3206
+#: addressbook/backend/ebook/e-card.c:3362
 msgid ""
 "\n"
 "Categories: "
@@ -244,7 +244,7 @@ msgstr ""
 "\n"
 "Categor�as: "
 
-#: addressbook/backend/ebook/e-card.c:3207
+#: addressbook/backend/ebook/e-card.c:3363
 msgid ""
 "\n"
 "Comment: "
@@ -262,13 +262,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3220
+#: addressbook/backend/ebook/e-card.c:3376
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3223
+#: addressbook/backend/ebook/e-card.c:3379
 msgid ""
 "\n"
 "Public Key: "
@@ -284,15 +284,15 @@ msgstr ""
 msgid "Imports GnomeCard files into Evolution."
 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
+#: 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:68 calendar/gui/main.c:54
+#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
@@ -304,20 +304,20 @@ msgstr "Non foi posible cargar o cursor\n"
 msgid "EBook not loaded\n"
 msgstr "EBook non cargado\n"
 
-#: addressbook/conduit/address-conduit.c:651
+#: addressbook/conduit/address-conduit.c:654
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Non foi posible iniciar o servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:652
+#: addressbook/conduit/address-conduit.c:655
 #: calendar/conduits/calendar/calendar-conduit.c:732
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Non foi posible 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 ""
 
@@ -325,7 +325,7 @@ 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:4
+#: mail/mail-config.glade.h:7
 msgid "Add"
 msgstr "Engadir"
 
@@ -366,7 +366,6 @@ msgstr "Arquivar Como:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:10
 #: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:27
 msgid "General"
 msgstr "Xeral"
 
@@ -383,7 +382,7 @@ msgid "Phone Types"
 msgstr "Tipos de Tel�fono"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "Primary Email"
 msgstr "Correo Electr�nico Principal"
 
@@ -396,7 +395,7 @@ msgid "Web page address:"
 msgstr "Enderezo da p�xina Web:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:74
 msgid "_Add"
 msgstr "_Engadir"
 
@@ -421,8 +420,8 @@ msgid "_Company:"
 msgstr "_Compa��a:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
+#: 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"
 msgstr "_Borrar"
 
@@ -474,129 +473,125 @@ msgstr "_Este � o enderezo da lista de correo"
 msgid "Delete Contact?"
 msgstr "�Borrar Contacto?"
 
-#: addressbook/contact-editor/e-contact-editor.c:590
+#: addressbook/contact-editor/e-contact-editor.c:603
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "Elemento(s) pertencentes a estas categor�as:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/widgets/e-addressbook-view.c:676
 msgid "Assistant"
 msgstr "Asistente"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1297
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1310
 msgid "Business"
 msgstr "Traballo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/contact-editor/e-contact-editor.c:1244
 msgid "Business 2"
 msgstr "Traballo 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Business Fax"
 msgstr "Fax do Traballo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "Car"
 msgstr "Autom�bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1248
 msgid "Company"
 msgstr "Compa��a"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
-#: addressbook/contact-editor/e-contact-editor.c:1298
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1311
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/contact-editor/e-contact-editor.c:1250
 msgid "Home 2"
 msgstr "Particular 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Home Fax"
 msgstr "Fax Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/contact-editor/e-contact-editor.c:1253
 msgid "Mobile"
 msgstr "M�bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/contact-editor/e-contact-editor.c:1299
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
+#: 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"
 msgstr "Outro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:662
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Pager"
 msgstr "Localizador (Pager)"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1257
 msgid "Primary"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/gui/widgets/e-addressbook-view.c:664
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/widgets/e-addressbook-view.c:665
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:1260
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
-#: addressbook/gui/widgets/e-addressbook-view.c:593
+#: 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:1273
-#: addressbook/gui/widgets/e-addressbook-view.c:594
+#: 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-quick-add.c:214
+#: addressbook/contact-editor/e-contact-quick-add.c:223
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:216
+#: addressbook/contact-editor/e-contact-quick-add.c:225
 #, fuzzy
 msgid "Edit Full"
 msgstr "Editar Filtros"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:253
+#: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/widgets/e-addressbook-view.c:643
 #, fuzzy
 msgid "Full Name"
 msgstr "Nome Completo:"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:259
+#: addressbook/contact-editor/e-contact-quick-add.c:268
 #, fuzzy
 msgid "E-mail"
 msgstr "Correo Electr�nico 2"
@@ -716,25 +711,25 @@ msgstr "_Sufixo:"
 msgid "_Title:"
 msgstr "_Tratamento:"
 
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:241
 msgid "As _Minicards"
 msgstr "Como _Minitarxetas"
 
-#: addressbook/gui/component/addressbook.c:243
+#: 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:412
+#: addressbook/gui/component/addressbook.c:399
 #, fuzzy, c-format
 msgid "Enter password for %s"
 msgstr "Introduza o contrasinal NNTP para %s@%s"
 
-#: addressbook/gui/component/addressbook.c:440
+#: 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:445
+#: 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"
@@ -746,187 +741,187 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:568
+#: addressbook/gui/component/addressbook.c:555
 #, fuzzy
 msgid "Show All"
 msgstr "Ver Todos"
 
-#: addressbook/gui/component/addressbook.c:570
+#: addressbook/gui/component/addressbook.c:557
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:587
 #, fuzzy
 msgid "Any field contains"
 msgstr "O corpo cont�n"
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:588
 #, fuzzy
 msgid "Name contains"
 msgstr "cont�n"
 
-#: addressbook/gui/component/addressbook.c:602
+#: addressbook/gui/component/addressbook.c:589
 #, fuzzy
 msgid "Email contains"
 msgstr "cont�n"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:732
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que amosar� o navegador de carpetas"
 
-#: addressbook/gui/component/addressbook-storage.c:95
+#: addressbook/gui/component/addressbook-storage.c:99
 #, fuzzy
 msgid "Other Contacts"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/addressbook-config.c:143
+#: addressbook/gui/component/addressbook-config.c:148
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Servidor LDAP:"
 
-#: addressbook/gui/component/addressbook-config.c:145
+#: addressbook/gui/component/addressbook-config.c:150
 #, fuzzy
 msgid "File"
 msgstr "_Ficheiro"
 
-#: addressbook/gui/component/addressbook-config.c:148
+#: addressbook/gui/component/addressbook-config.c:153
 #, fuzzy
 msgid "Unknown addressbook type"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook-config.c:158
+#: addressbook/gui/component/addressbook-config.c:163
 msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:261
+#: 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-store.c:145
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
 msgid "Password"
 msgstr "Contrasinal"
 
-#: addressbook/gui/component/addressbook-config.c:162
+#: addressbook/gui/component/addressbook-config.c:167
 msgid "SASL"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:165
+#: addressbook/gui/component/addressbook-config.c:170
 #, fuzzy
 msgid "Unknown auth type"
 msgstr "Erro desco�ecido"
 
-#: addressbook/gui/component/addressbook-config.c:174
+#: addressbook/gui/component/addressbook-config.c:179
 #, fuzzy
 msgid "Base"
 msgstr "Pegar"
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:178
+#: addressbook/gui/component/addressbook-config.c:183
 #, fuzzy
 msgid "Subtree"
 msgstr "Subscribir"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-config.c:186
 msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:348
+#: addressbook/gui/component/addressbook-config.c:353
 msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:349
+#: addressbook/gui/component/addressbook-config.c:354
 msgid "FIXME Bind DN Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:351
+#: addressbook/gui/component/addressbook-config.c:356
+#: mail/mail-config.glade.h:50
 msgid "Remember this password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:401
+#: addressbook/gui/component/addressbook-config.c:406
 #: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Host:"
 msgstr "Horas"
 
-#: addressbook/gui/component/addressbook-config.c:402
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "FIXME Host help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:404
+#: addressbook/gui/component/addressbook-config.c:409
 #, fuzzy
 msgid "Port:"
 msgstr "Prioridade:"
 
-#: addressbook/gui/component/addressbook-config.c:405
+#: addressbook/gui/component/addressbook-config.c:410
 msgid "FIXME Port help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/component/addressbook-config.c:414
 msgid "Root DN:"
 msgstr "DN Ra�z:"
 
-#: addressbook/gui/component/addressbook-config.c:410
+#: addressbook/gui/component/addressbook-config.c:415
 msgid "FIXME Root DN help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:430
+#: addressbook/gui/component/addressbook-config.c:435
 #, fuzzy
 msgid "Search Scope:"
 msgstr "Buscar"
 
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:8
+#: addressbook/gui/component/addressbook-config.c:489
 msgid "Authentication:"
 msgstr "Autenticaci�n:"
 
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
+#: addressbook/gui/component/addressbook-config.c:507
+#: mail/mail-config.glade.h:44
 msgid "Path:"
 msgstr "Cami�o:"
 
-#: addressbook/gui/component/addressbook-config.c:503
+#: addressbook/gui/component/addressbook-config.c:508
 msgid "FIXME Path Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:508
+#: addressbook/gui/component/addressbook-config.c:513
 #, fuzzy
 msgid "Create path if it doesn't exist."
 msgstr "O ficheiro non existe."
 
-#: addressbook/gui/component/addressbook-config.c:642
+#: addressbook/gui/component/addressbook-config.c:647
 #, fuzzy
 msgid "Edit Addressbook"
 msgstr "Gardar no libro de enderezos"
 
-#: addressbook/gui/component/addressbook-config.c:644
+#: addressbook/gui/component/addressbook-config.c:649
 #, fuzzy
 msgid "Add Addressbook"
 msgstr "Gardar no libro de enderezos"
 
-#: addressbook/gui/component/addressbook-config.c:660
+#: 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:666
-#: mail/mail-config.glade.h:41
+#: addressbook/gui/component/addressbook-config.c:671
+#: mail/mail-config.glade.h:35
 msgid "Name:"
 msgstr "Nome:"
 
-#: addressbook/gui/component/addressbook-config.c:667
+#: addressbook/gui/component/addressbook-config.c:672
 msgid "FIXME Name help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:669
+#: 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:670
+#: addressbook/gui/component/addressbook-config.c:675
 msgid "FIXME Description help text here"
 msgstr ""
 
@@ -936,23 +931,24 @@ msgid "Addressbook Sources"
 msgstr "Engadir Fonte"
 
 #: 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:571
-#: mail/mail-config.glade.h:20 mail/mail-view.c:150
+#: 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:7 ui/evolution-task-editor-dialog.xml.h:18
+#: 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:22
+#: mail/mail-config.glade.h:23
 msgid "Edit"
 msgstr "Editar"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:578
 #, fuzzy
 msgid "Name"
 msgstr "Nome:"
@@ -962,51 +958,74 @@ msgstr "Nome:"
 msgid "URI"
 msgstr "URL:"
 
-#: addressbook/gui/component/e-address-widget.c:259
-#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#: addressbook/gui/component/e-address-widget.c:365
+#, fuzzy
+msgid "Disable Queries"
+msgstr "Categor�as Dispo�ibles:"
+
+#: 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"
 msgstr "_Novo Contacto"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for displaying an address."
+msgid "A Bonobo control for an address popup."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A sample Bonobo control which displays an addressbook."
+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 ""
 "Utilidade de configuraci�n para o conducto de libro de enderezos de "
 "evolution.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #, fuzzy
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Conducto de Libro de Enderezos de Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: 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:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 #, fuzzy
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: 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:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the Addressbook's address popup"
+msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 #, fuzzy
 msgid "Factory for the Evolution addressbook component."
 msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 #, fuzzy
 msgid "Factory for the sample Addressbook control"
 msgstr "Prema aqu� para o libro de enderezos"
@@ -1020,21 +1039,18 @@ msgstr "Conducto de Libro de Enderezos de Evolution"
 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
+#: 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 "Quitar"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#: addressbook/gui/component/select-names/e-select-names-popup.c:146
 #, fuzzy
 msgid "Remove All"
 msgstr "Quitar"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
-msgid "Edit Contact Info"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Buscar..."
@@ -1054,7 +1070,7 @@ msgstr "Seleccionar un nome da Lista:"
 msgid "Select name from:"
 msgstr "Seleccionar un nome da Lista:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
 msgid "Search"
 msgstr "Buscar"
 
@@ -1166,83 +1182,182 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:481
-#: addressbook/gui/widgets/e-minicard.c:435
+#: 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
 msgid "Save as VCard"
 msgstr "Gardar como VCard"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-minicard.c:669
+msgid "Send contact to other"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-minicard.c:670
+#, fuzzy
+msgid "Send message to contact"
+msgstr "Enviar unha mensaxe sen asunto"
+
+#: 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
+msgid "Print"
+msgstr "Imprimir"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-minicard.c:672
+#, fuzzy
+msgid "Print Envelope"
+msgstr "_Configuraci�n da Impresi�n..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:641
 #, fuzzy
 msgid "* Click here to add a contact *"
 msgstr "<prema aqu� para seleccionar unha data>"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/gui/widgets/e-addressbook-view.c:642
+#, fuzzy
+msgid "File As"
+msgstr "Arquivar Como:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:644
 #, fuzzy
 msgid "Email"
 msgstr "Correo Electr�nico 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:645
+#, fuzzy
+msgid "Primary Phone"
+msgstr "Correo Electr�nico Principal"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:646
+#, fuzzy
+msgid "Assistant Phone"
+msgstr "Asistente"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:647
+#, fuzzy
+msgid "Business Phone"
+msgstr "Traballo 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:648
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:649
+#, fuzzy
+msgid "Company Phone"
+msgstr "Compa��a"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:650
+#, fuzzy
+msgid "Home Phone"
+msgstr "Particular 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:651
 msgid "Organization"
 msgstr "Organizaci�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:595
+#: addressbook/gui/widgets/e-addressbook-view.c:652
+#, fuzzy
+msgid "Business Address"
+msgstr "Traballo 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:653
+#, fuzzy
+msgid "Home Address"
+msgstr "Enderezo"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:654
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "M�bil"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:658
+#, fuzzy
+msgid "Business Phone 2"
+msgstr "Traballo 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:659
+#, fuzzy
+msgid "Home Phone 2"
+msgstr "Particular 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:661
+#, fuzzy
+msgid "Other Phone"
+msgstr "_Novo Contacto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:666
+msgid "TTY"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:667
+#, fuzzy
+msgid "Other Address"
+msgstr "Enderezo"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:670
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:596
+#: addressbook/gui/widgets/e-addressbook-view.c:671
 #, fuzzy
 msgid "Department"
 msgstr "_Departamento:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:597
+#: addressbook/gui/widgets/e-addressbook-view.c:672
 #, fuzzy
 msgid "Office"
 msgstr "_Oficina:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:673
 #, fuzzy
 msgid "Title"
 msgstr "_Tratamento:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:674
 #, fuzzy
 msgid "Profession"
 msgstr "_Profesi�n:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:600
+#: addressbook/gui/widgets/e-addressbook-view.c:675
 #, fuzzy
 msgid "Manager"
 msgstr "Localizador (Pager)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 #, fuzzy
 msgid "Nickname"
 msgstr "_Sobrenome:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-view.c:678
 #, fuzzy
 msgid "Spouse"
 msgstr "_C�nxuxe:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: addressbook/gui/widgets/e-addressbook-view.c:679
 #, fuzzy
 msgid "Note"
 msgstr "No_tas:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:606
-#, fuzzy
-msgid "Click here to add a contact"
-msgstr "<prema aqu� para seleccionar unha data>"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-minicard-control.c:282
 msgid "Save in addressbook"
 msgstr "Gardar no libro de enderezos"
 
-#: addressbook/gui/widgets/e-minicard-view.c:141
+#: addressbook/gui/widgets/e-minicard-view.c:166
 msgid ""
 "\n"
 "\n"
@@ -1256,7 +1371,7 @@ msgstr ""
 "\n"
 "Faga dobre clic aqu� para crear un novo Contacto."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr ""
 
@@ -1444,126 +1559,127 @@ msgstr ""
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:233
+#: calendar/gui/calendar-commands.c:266
 msgid "File not found"
 msgstr "Ficheiro non atopado"
 
-#: calendar/gui/calendar-commands.c:257
+#: calendar/gui/calendar-commands.c:290
 msgid "Open calendar"
 msgstr "Abrir axenda"
 
-#: calendar/gui/calendar-commands.c:299
+#: calendar/gui/calendar-commands.c:332
 msgid "Save calendar"
 msgstr "Gardar axenda"
 
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:468
 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:360 calendar/gui/calendar-model.c:895
+#: calendar/gui/e-calendar-table.c:330
 msgid "Public"
 msgstr "P�blico"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
+#: calendar/gui/e-calendar-table.c:331
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
+#: calendar/gui/e-calendar-table.c:332
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: 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:200
+#: 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
 msgid "Unknown"
 msgstr "Desco�ecido"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: 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:351
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
 msgid "High"
 msgstr "Alta"
 
-#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
-#: calendar/gui/calendar-model.c:1596
+#: 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:352
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: 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:353
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
 msgid "Low"
 msgstr "Baixa"
 
-#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
+#: calendar/gui/e-calendar-table.c:406
 msgid "Transparent"
 msgstr "Transparente"
 
-#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
+#: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: 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:425
+#: calendar/gui/e-calendar-table.c:426
 msgid "Not Started"
 msgstr "Non Iniciada"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: 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:426
+#: calendar/gui/e-calendar-table.c:427
 msgid "In Progress"
 msgstr "En Progreso"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: 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:427
+#: calendar/gui/e-calendar-table.c:428
 #, fuzzy
 msgid "Completed"
 msgstr "% Comp_leta:"
 
-#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: 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:428
+#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
+#: camel/camel-service.c:586
 #, fuzzy
 msgid "Cancelled"
 msgstr "Cancelar"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
 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:800 e-util/e-time-utils.c:285
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:805
+#: calendar/gui/calendar-model.c:799
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1574,24 +1690,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:885
+#: calendar/gui/calendar-model.c:879
 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:756
-#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
-#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
-#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
-#: 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: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
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:967
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1601,39 +1716,39 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1013
+#: calendar/gui/calendar-model.c:1007
 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:1054
+#: calendar/gui/calendar-model.c:1048
 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/calendar-model.c:1061
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:355
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1108
+#: calendar/gui/calendar-model.c:1102
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1598
+#: calendar/gui/calendar-model.c:1571
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1600
+#: calendar/gui/calendar-model.c:1573
 #, fuzzy
 msgid "Assigned"
 msgstr "Asignar Puntuaci�n"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 #, fuzzy
 msgid "No"
 msgstr "Agora"
@@ -1706,25 +1821,25 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:73
+#: calendar/gui/alarm-notify/notify-main.c:77
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "Non foi posible crear o directorio temporal: %s"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+#: 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-notify-dialog.c:191
+#: 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-notify-dialog.c:202
+#: calendar/gui/dialogs/alarm-notify-dialog.c:207
 msgid "No summary available."
 msgstr ""
 
@@ -1817,7 +1932,7 @@ msgid "Display options"
 msgstr "_Visualizar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:162
 msgid "Due Date"
 msgstr ""
 
@@ -1838,7 +1953,7 @@ msgid "Fri"
 msgstr "Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
 msgid "Friday"
 msgstr "Venres"
 
@@ -1868,7 +1983,7 @@ msgid "Mon"
 msgstr "Lun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
 msgid "Monday"
 msgstr "Luns"
 
@@ -1881,11 +1996,12 @@ 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:34
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:165
 msgid "Priority"
 msgstr "Prioridade"
 
@@ -1905,7 +2021,7 @@ msgid "Sat"
 msgstr "S�b"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:482
 msgid "Saturday"
 msgstr "S�bado"
 
@@ -1932,7 +2048,7 @@ msgid "Sun"
 msgstr "Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:483
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -1946,7 +2062,7 @@ msgid "Thu"
 msgstr "Xov"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
 msgid "Thursday"
 msgstr "Xoves"
 
@@ -1968,7 +2084,7 @@ msgid "Tue"
 msgstr "Mar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -1981,7 +2097,7 @@ msgid "Wed"
 msgstr "M�r"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
 msgid "Wednesday"
 msgstr "M�rcores"
 
@@ -1995,46 +2111,46 @@ msgid "minutes before they occur."
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:78
 msgid "seconds."
 msgstr "segundos."
 
-#: calendar/gui/dialogs/delete-comp.c:68
+#: calendar/gui/dialogs/delete-comp.c:70
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 "�Est� seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:73
 #, fuzzy
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 "�Est� seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:77
+#: calendar/gui/dialogs/delete-comp.c:79
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 "�Est� seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:82
 #, fuzzy
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 "�Est� seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:86
+#: calendar/gui/dialogs/delete-comp.c:88
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 "�Est� seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:89
+#: calendar/gui/dialogs/delete-comp.c:91
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
@@ -2051,7 +2167,7 @@ msgid "% Comp_lete:"
 msgstr "% Comp_leta:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:158
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Clasificaci�n"
@@ -2124,318 +2240,331 @@ msgstr "_Prioridade:"
 msgid "_Status:"
 msgstr "_Estado:"
 
-#: calendar/gui/dialogs/task-editor.c:689
+#: calendar/gui/dialogs/task-editor.c:697
 msgid "Edit Task"
 msgstr "Editar Tarefa"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
+#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
 msgid "No summary"
 msgstr "Sen resume"
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
+#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
+#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:157
 #, fuzzy
 msgid "Categories"
 msgstr "categor�as"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:159
 #, fuzzy
 msgid "Completion Date"
 msgstr "Completada"
 
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:160
 #, fuzzy
 msgid "End Date"
 msgstr "Hora de _finalizaci�n:"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:161
 #, fuzzy
 msgid "Start Date"
 msgstr "Data de _Inicio:"
 
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:163
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:164
 #, fuzzy
 msgid "Percent complete"
 msgstr "Marcar a tarefa como completa"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:166
 #, fuzzy
 msgid "Summary"
 msgstr "_Resume"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:167
 #, fuzzy
 msgid "Transparency"
 msgstr "Transparente"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:168
 #, fuzzy
 msgid "URL"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/e-calendar-table.c:169
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.c:169
+#: calendar/gui/e-calendar-table.c:170
 #, fuzzy
 msgid "Click here to add a task"
 msgstr "Prema aqu� para o libro de enderezos"
 
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:374
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:375
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:376
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:377
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:378
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:379
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:380
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:381
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:382
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:383
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:384
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:550
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark Complete"
 msgstr "Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:551
+#: calendar/gui/e-calendar-table.c:552
 msgid "Mark the task complete"
 msgstr "Marcar a tarefa como completa"
 
-#: calendar/gui/e-calendar-table.c:556
+#: calendar/gui/e-calendar-table.c:557
 #, fuzzy
 msgid "Edit this task..."
 msgstr "Editar esta cita..."
 
-#: calendar/gui/e-calendar-table.c:557
+#: calendar/gui/e-calendar-table.c:558
 #, fuzzy
 msgid "Edit the task"
 msgstr "Editar Tarefa"
 
-#: calendar/gui/e-calendar-table.c:559
+#: calendar/gui/e-calendar-table.c:560
 #: ui/evolution-task-editor-dialog.xml.h:19
 #, fuzzy
 msgid "Delete this task"
 msgstr "Borrar a tarefa"
 
-#: calendar/gui/e-calendar-table.c:560
+#: calendar/gui/e-calendar-table.c:561
 msgid "Delete the task"
 msgstr "Borrar a tarefa"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: 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:1274
-#: calendar/gui/e-week-view-main-item.c:321
+#: 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"
 
 #. 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:1288
-#: calendar/gui/e-week-view-main-item.c:330
+#: 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:279 calendar/gui/e-day-view.c:1301
-#: calendar/gui/e-week-view-main-item.c:344
+#: 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 de %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:613
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:617
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
-#: calendar/gui/print.c:612
+#: 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-day-view.c:3020 calendar/gui/e-day-view.c:3034
-#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
+#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "New Appointment..."
+msgid "New Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
-#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
+#, fuzzy
+msgid "New All Day Event"
+msgstr "Evento de d�a _completo"
+
+#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
+#, fuzzy
+msgid "Go to Today"
+msgstr "Ir a hoxe"
+
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#, fuzzy
+msgid "Go to Date..."
+msgstr "Ir � 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
 #, fuzzy
 msgid "Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete this Appointment"
 msgstr "Borrar esta cita"
 
-#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: 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 "FIXME: Programar Reuni�n"
 
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
 #, fuzzy
 msgid "Make this Occurrence Movable"
 msgstr "Gardar o ficheiro actual"
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Borrar este elemento"
 
-#: calendar/gui/e-day-view.c:3047
+#: calendar/gui/e-day-view.c:3179
 #, fuzzy
 msgid "Delete all Occurrences"
 msgstr "Borrar un contacto"
 
-#: calendar/gui/e-itip-control.c:153
+#: calendar/gui/e-itip-control.c:161
 #, fuzzy
 msgid "I couldn't update your calendar file!\n"
 msgstr "Non foi posible crear un calendario en `%s'"
 
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
+#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
 #, fuzzy
 msgid "Component successfully updated."
 msgstr "Ficheiros de Evolution instalados con �xito."
 
-#: calendar/gui/e-itip-control.c:165
+#: calendar/gui/e-itip-control.c:173
 msgid "There was an error loading the calendar file."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:189
+#: calendar/gui/e-itip-control.c:197
 msgid "I couldn't open your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
+#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
 msgid "I couldn't load your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:462
+#: calendar/gui/e-itip-control.c:470
 #, fuzzy
 msgid "I couldn't read your calendar file!\n"
 msgstr "Non foi posible crear un calendario en `%s'"
 
-#: calendar/gui/e-itip-control.c:475
+#: calendar/gui/e-itip-control.c:483
 msgid "This is a reply from someone who was uninvited!"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:491
+#: calendar/gui/e-itip-control.c:499
 #, fuzzy
 msgid "I couldn't update your calendar store."
 msgstr "Non foi posible crear un calendario en `%s'"
 
-#: calendar/gui/e-itip-control.c:532
+#: calendar/gui/e-itip-control.c:540
 msgid "I couldn't delete the calendar component!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:542
+#: calendar/gui/e-itip-control.c:550
 #, fuzzy
 msgid "Component successfully deleted."
 msgstr "Ficheiros de Evolution instalados con �xito."
 
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:694
 #, fuzzy
 msgid "I don't recognize this type of calendar component."
 msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:780
 #, fuzzy
 msgid "Add to Calendar"
 msgstr "Axenda"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:814
 #, fuzzy
-msgid "Accept"
+msgid " Accept "
 msgstr "Contas"
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:815
 #, fuzzy
-msgid "Decline"
+msgid " Decline "
 msgstr "Eliminar"
 
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
+#: calendar/gui/e-itip-control.c:816
+msgid " Tentative "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:852
+#: calendar/gui/e-itip-control.c:860
 #, fuzzy
 msgid "Update Calendar"
 msgstr "_Abrir axenda"
 
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:883
 #, fuzzy
 msgid "Cancel Meeting"
 msgstr "FIXME: Programar Reuni�n"
@@ -2454,7 +2583,7 @@ msgstr ""
 msgid "Calendar Message"
 msgstr "Axenda"
 
-#: calendar/gui/e-itip-control.glade.h:5
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
 #, fuzzy
 msgid "Date:"
 msgstr "Pegar"
@@ -2469,9 +2598,10 @@ msgstr "Imprimir axenda"
 msgid "Organizer:"
 msgstr "Organizaci�n:"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
-msgid "Sender"
-msgstr "Autor"
+#: calendar/gui/e-itip-control.glade.h:10
+#, fuzzy
+msgid "Server Message:"
+msgstr "Mover Mensaxe"
 
 #: calendar/gui/e-itip-control.glade.h:11
 #, fuzzy
@@ -2564,30 +2694,30 @@ msgid ""
 "Time"
 msgstr "FIXME: Programar Reuni�n"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
-#: mail/message-list.c:1171
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
+#: mail/message-list.c:1052
 #, fuzzy
 msgid "Status"
 msgstr "_Estado:"
 
-#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
-#: calendar/gui/e-tasks.c:501
+#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
+#: calendar/gui/e-tasks.c:502
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:154
+#: calendar/gui/e-tasks.c:155
 #, fuzzy
 msgid "Category:"
 msgstr ""
 "\n"
 "Categor�as: "
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:298
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Non foi posible cargar a axenda en `%s'"
 
-#: calendar/gui/e-tasks.c:309
+#: calendar/gui/e-tasks.c:310
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "O m�todo requirido para cargar `%s' non est� soportado"
@@ -2595,11 +2725,16 @@ msgstr "O m�todo requirido para cargar `%s' non est� 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:338
+#: calendar/gui/e-week-view-main-item.c:342
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: calendar/gui/e-week-view.c:3255
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+#, fuzzy
+msgid "New Appointment..."
+msgstr "Nova cita..."
+
+#: calendar/gui/e-week-view.c:3314
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Fontes"
@@ -2642,7 +2777,7 @@ msgid "No recurrence"
 msgstr "Fontes"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1577
+#: calendar/gui/event-editor.c:1579
 msgid "Play a sound"
 msgstr ""
 
@@ -2667,24 +2802,24 @@ msgid "Reminder"
 msgstr "Autor"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1586
+#: calendar/gui/event-editor.c:1588
 #, fuzzy
 msgid "Run a program"
 msgstr "_Executar programa:"
 
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1583
+#: calendar/gui/event-editor.c:1585
 #, fuzzy
 msgid "Send an email"
 msgstr "Recibindo correo de %s"
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
 #, fuzzy
 msgid "Settings..."
 msgstr "_Configuraci�n"
 
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1580
+#: calendar/gui/event-editor.c:1582
 #, fuzzy
 msgid "Show a dialog"
 msgstr "Amosar un d�a"
@@ -2706,12 +2841,11 @@ msgstr "Hora de _comezo:"
 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
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
 msgid "after"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
 msgid "before"
 msgstr ""
 
@@ -2738,7 +2872,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr "horas"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
 #, fuzzy
 msgid "minute(s)"
 msgstr "minutos"
@@ -2765,109 +2899,109 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: calendar/gui/event-editor.c:371
+#: calendar/gui/event-editor.c:373
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/event-editor.c:449
+#: calendar/gui/event-editor.c:451
 msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
 msgid "day"
 msgstr "d�a"
 
-#: calendar/gui/event-editor.c:601
+#: calendar/gui/event-editor.c:603
 #, fuzzy
 msgid "on the"
 msgstr "mes"
 
-#: calendar/gui/event-editor.c:608
+#: calendar/gui/event-editor.c:610
 #, fuzzy
 msgid "th"
 msgstr "4"
 
-#: calendar/gui/event-editor.c:754
+#: calendar/gui/event-editor.c:756
 #, fuzzy
 msgid "occurrences"
 msgstr "Fontes"
 
-#: calendar/gui/event-editor.c:871
+#: calendar/gui/event-editor.c:873
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1532
+#: calendar/gui/event-editor.c:1534
 #, fuzzy, c-format
 msgid " %d days"
 msgstr "d�as"
 
-#: calendar/gui/event-editor.c:1534
+#: calendar/gui/event-editor.c:1536
 #, fuzzy
 msgid " 1 day"
 msgstr "Amosar un d�a"
 
-#: calendar/gui/event-editor.c:1537
+#: calendar/gui/event-editor.c:1539
 #, fuzzy, c-format
 msgid " %d weeks"
 msgstr "semanas"
 
-#: calendar/gui/event-editor.c:1539
+#: calendar/gui/event-editor.c:1541
 #, fuzzy
 msgid " 1 week"
 msgstr "Amosar unha semana"
 
-#: calendar/gui/event-editor.c:1542
+#: calendar/gui/event-editor.c:1544
 #, fuzzy, c-format
 msgid " %d hours"
 msgstr "horas"
 
-#: calendar/gui/event-editor.c:1544
+#: calendar/gui/event-editor.c:1546
 #, fuzzy
 msgid " 1 hour"
 msgstr "hora"
 
-#: calendar/gui/event-editor.c:1547
+#: calendar/gui/event-editor.c:1549
 #, fuzzy, c-format
 msgid " %d minutes"
 msgstr "minutos"
 
-#: calendar/gui/event-editor.c:1549
+#: calendar/gui/event-editor.c:1551
 #, fuzzy
 msgid " 1 minute"
 msgstr "10 minutos"
 
-#: calendar/gui/event-editor.c:1552
+#: calendar/gui/event-editor.c:1554
 #, fuzzy, c-format
 msgid " %d seconds"
 msgstr " segundos"
 
-#: calendar/gui/event-editor.c:1554
+#: calendar/gui/event-editor.c:1556
 #, fuzzy
 msgid " 1 second"
 msgstr " segundos"
 
-#: calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1603
 #, fuzzy
 msgid " before start of appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/event-editor.c:1603
+#: calendar/gui/event-editor.c:1605
 #, fuzzy
 msgid " after start of appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/event-editor.c:1611
+#: calendar/gui/event-editor.c:1613
 #, fuzzy
 msgid " before end of appointment"
 msgstr "Borrar esta cita"
 
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/event-editor.c:1615
 #, fuzzy
 msgid " after end of appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
-#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
+#: 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"
 
@@ -2909,14 +3043,14 @@ msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
 msgid "Factory for the sample Calendar control"
 msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
 
-#: calendar/gui/gnome-cal.c:695
+#: calendar/gui/gnome-cal.c:700
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 "Non � posible abrir a carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/gnome-cal.c:706
+#: calendar/gui/gnome-cal.c:711
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O m�todo requirido para cargar `%s' non est� soportado"
@@ -2991,202 +3125,202 @@ msgstr "outubro"
 msgid "September"
 msgstr "setembro"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:306
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Th"
 msgstr "Xo"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Sa"
 msgstr "Sa"
 
-#: calendar/gui/print.c:944
+#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tarefas"
 
 #. Day
-#: calendar/gui/print.c:1074
+#: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
 msgstr "D�a actual (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1089
+#: calendar/gui/print.c:1093
 msgid "%a %d %Y"
 msgstr "%a %d de %Y"
 
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1104
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Semana actual (%s - %s)"
 
 # Isto est� mal, o %a � o nome de semana
 #. Month
-#: calendar/gui/print.c:1108
+#: calendar/gui/print.c:1112
 msgid "Current month (%b %Y)"
 msgstr "Mes actual (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1115
+#: calendar/gui/print.c:1119
 msgid "Current year (%Y)"
 msgstr "Ano actual (%Y)"
 
-#: calendar/gui/print.c:1152
+#: calendar/gui/print.c:1156
 msgid "Print Calendar"
 msgstr "Imprimir axenda"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:32
+#: 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
 msgid "Print Preview"
 msgstr "Previsualizar da Impresi�n"
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/tasks-control.c:108
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "O URI que amosar� a axenda"
@@ -3219,26 +3353,105 @@ 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 "DLMMXVS"
 
-#: camel/camel-filter-driver.c:790
+#: camel/camel-cipher-context.c:169
+#, fuzzy
+msgid "Signing is not supported by this cipher"
+msgstr "O tipo especificado non est� soportado neste almacenamento"
+
+#: camel/camel-cipher-context.c:207
+#, fuzzy
+msgid "Clearsigning is not supported by this cipher"
+msgstr "O tipo especificado non est� soportado neste almacenamento"
+
+#: camel/camel-cipher-context.c:245
+#, fuzzy
+msgid "Verifying is not supported by this cipher"
+msgstr "O tipo especificado non est� soportado neste almacenamento"
+
+#: camel/camel-cipher-context.c:286
+#, fuzzy
+msgid "Encryption is not supported by this cipher"
+msgstr "O tipo especificado non est� soportado neste almacenamento"
+
+#: camel/camel-cipher-context.c:326
+#, fuzzy
+msgid "Decryption is not supported by this cipher"
+msgstr "O tipo especificado non est� soportado neste almacenamento"
+
+#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#, fuzzy
+msgid "Syncing folders"
+msgstr "Sincronizando \"%s\""
+
+#: camel/camel-filter-driver.c:643
+#, fuzzy
+msgid "Unable to open spool folder"
+msgstr "Non se pode abrir o libro de enderezos"
+
+#: camel/camel-filter-driver.c:652
+#, fuzzy
+msgid "Unable to process spool folder"
+msgstr ""
+"Non foi posible crear a carpeta `%s':\n"
+"%s"
+
+#: camel/camel-filter-driver.c:666
+#, fuzzy
+msgid "Getting message %d (%d%%)"
+msgstr "Escribindo a mensaxe %d de %d"
+
+#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#, fuzzy, c-format
+msgid "Failed message %d"
+msgstr "_Mensaxe"
+
+#: camel/camel-filter-driver.c:671
+#, fuzzy
+msgid "Cannot open message"
+msgstr ""
+"Non � posible obter a mensaxe: %s\n"
+"  %s"
+
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#, fuzzy
+msgid "Syncing folder"
+msgstr "Sincronizando \"%s\""
+
+#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
+#, fuzzy
+msgid "Complete"
+msgstr "% Comp_leta:"
+
+#: camel/camel-filter-driver.c:748
+#, fuzzy, c-format
+msgid "Getting message %d of %d"
+msgstr "Escribindo a mensaxe %d de %d"
+
+#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#, fuzzy, c-format
+msgid "Failed at message %d of %d"
+msgstr "Escribindo a mensaxe %d de %d"
+
+#: camel/camel-filter-driver.c:866
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: camel/camel-filter-driver.c:795
+#: camel/camel-filter-driver.c:871
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: camel/camel-folder-search.c:323
+#: camel/camel-folder-search.c:328
 #, fuzzy, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3247,7 +3460,7 @@ msgstr ""
 "Erro na expresi�n regular '%s':\n"
 "%s"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:338
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3256,155 +3469,226 @@ msgstr ""
 "Erro na expresi�n regular '%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 ""
 
 #. 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 camel/camel-movemail.c:138
+#: camel/camel-movemail.c:185
 #, 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:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151 camel/camel-movemail.c:219
 #, 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:101
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:148
 #, 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:156
+#: camel/camel-movemail.c:158
 #, 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:197
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:243
+#: 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:254
+#: 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:272
+#: camel/camel-movemail.c:274
 #, 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:304
+#: camel/camel-movemail.c:306
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Non foi posible crear unha canalizaci�n: %s"
 
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:318
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Non foi posible facer fork: %s"
 
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:356
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "O programa movemail fallou: %s"
 
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:357
 msgid "(Unknown error)"
 msgstr "(Erro desco�ecido)"
 
-#: camel/camel-provider.c:137
+#: camel/camel-movemail.c:587
+#, fuzzy, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "Erro escribindo o ficheiro temporal de correo: %s"
+
+#: camel/camel-pgp-context.c:186
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Introduza o seu contrasinal de PGP/GPG."
+
+#: camel/camel-pgp-context.c:189
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Introduza o seu contrasinal de PGP/GPG."
+
+#: camel/camel-pgp-context.c:509
+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
+msgid "No password provided."
+msgstr "Non se indicou un contrasinal."
+
+#: 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
+#, 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:681
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:871
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:888
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Non foi posible crear unha canalizaci�n: %s"
+
+#: camel/camel-pgp-context.c:1011
+msgid "No plaintext to encrypt."
+msgstr ""
+
+#: camel/camel-pgp-context.c:1037
+msgid "No recipients specified"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1227
+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 "Non foi posible cargar %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 ""
 
-#: camel/camel-remote-store.c:181
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:185
+#: camel/camel-remote-store.c:190
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:232
+#: camel/camel-remote-store.c:240
 #, fuzzy
 msgid "Connection cancelled"
 msgstr "Cancelada"
 
-#: camel/camel-remote-store.c:235
-#: camel/providers/smtp/camel-smtp-transport.c:244
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:261
 #, 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:236
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(m�quina desco�ecida)"
 
-#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
-#: camel/camel-remote-store.c:448
-#: camel/providers/imap/camel-imap-command.c:289
+#: 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
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Abrir axenda"
 
-#: camel/camel-remote-store.c:453
+#: camel/camel-remote-store.c:464
 #, fuzzy
 msgid "Server unexpectedly disconnected"
 msgstr "O servidor rexeitou o nome de usuario"
 
-#: 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 ""
+"Esta opci�n conectarase � servidor IMAP usando un contrasinal sen cifrar."
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autenticaci�n"
 
-#: 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
 #, fuzzy, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -3413,7 +3697,7 @@ msgstr ""
 "Erro cargando a informaci�n do filtro:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:130
+#: camel/camel-sasl-anonymous.c:143
 #, fuzzy, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -3422,11 +3706,11 @@ msgstr ""
 "Erro cargando a informaci�n do filtro:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+#: 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
 #, fuzzy
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
@@ -3434,11 +3718,11 @@ msgid ""
 msgstr ""
 "Esta opci�n conectarase � servidor IMAP usando autenticaci�n Kerberos 4."
 
-#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+#: 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
 #, fuzzy
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
@@ -3446,109 +3730,113 @@ msgid ""
 msgstr ""
 "Esta opci�n conectarase � servidor IMAP usando un contrasinal sen cifrar."
 
-#: 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 "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-kerberos4.c:42
 #, fuzzy
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "Esta opci�n conectarase � servidor IMAP usando autenticaci�n Kerberos 4."
 
-#: camel/camel-sasl-kerberos4.c:158
+#: camel/camel-sasl-kerberos4.c:161
 #, fuzzy, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr "Non foi posible crear unha canalizaci�n: %s"
 
-#: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:381
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:417
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Resposta non agardada do servidor IMAP: %s"
 
-#: camel/camel-sasl-plain.c:29
-msgid "PLAIN"
-msgstr ""
-
-#: camel/camel-sasl-plain.c:31
+#: camel/camel-sasl-plain.c:34
 #, fuzzy
-msgid ""
-"This option will connect to the server using a the PLAIN SASL mechanism if "
-"the server supports it."
+msgid "This option will connect to the server using a simple password."
 msgstr ""
 "Esta opci�n conectarase � servidor IMAP usando un contrasinal sen cifrar."
 
-#: camel/camel-search-private.c:105
+#: camel/camel-search-private.c:110
 #, fuzzy, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Erro escribindo � caixa de correo temporal: %s"
 
-#: camel/camel-service.c:142
+#: camel/camel-service.c:152
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "O URL '%s' necesita unha parte co nome do usuario"
 
-#: camel/camel-service.c:151
+#: camel/camel-service.c:160
 #, 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:160
+#: camel/camel-service.c:168
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte co cami�o"
 
-#: camel/camel-service.c:512
+#: camel/camel-service.c:554
+#, fuzzy, c-format
+msgid "Resolving: %s"
+msgstr "Probando \"%s\""
+
+#: camel/camel-service.c:581
+#, c-format
+msgid "Failure in name lookup: %s"
+msgstr ""
+
+#: camel/camel-service.c:606
 #, c-format
-msgid "No such host %s."
+msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:515
+#: camel/camel-service.c:608
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
+msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:54
+#: camel/camel-session.c:57
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:59
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:322
+#: camel/camel-session.c:274 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:417
+#: camel/camel-session.c:462
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3558,121 +3846,149 @@ msgstr ""
 "%s"
 
 #. Fill in the new fields
-#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
-#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#: 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
 #, fuzzy
 msgid "Trash"
 msgstr "Tarefa"
 
-#: camel/camel-url.c:77
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "O URL `%s' non cont�n ning�n protocolo"
-
-#: camel/camel-url.c:92
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "O URL `%s' cont�n un protocolo non v�lido"
+#: camel/camel-url.c:289
+#, fuzzy, c-format
+msgid "Could not parse URL `%s'"
+msgstr ""
+"Non foi posible abrir o ficheiro `%s':\n"
+"%s"
 
-#: camel/camel-url.c:152
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "O n�mero de porto no URL `%s' non � num�rico"
+#: camel/camel-vee-folder.c:451
+#, fuzzy, c-format
+msgid "No such message %s in %s"
+msgstr "Re-enviar esta mensaxe"
 
-#: camel/camel-vee-folder.c:960
+#: camel/camel-vee-folder.c:545
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "Re-enviar esta mensaxe"
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:209
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta non agardada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:217
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
+#: 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:297
+#: camel/providers/imap/camel-imap-command.c:272
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:433
+#: camel/providers/imap/camel-imap-command.c:456
 #, 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:490
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:172
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:329
+#: camel/providers/imap/camel-imap-folder.c:351
 #, fuzzy
 msgid "Scanning IMAP folder"
 msgstr "Examinando as carpetas en \"%s\""
 
-#: camel/providers/imap/camel-imap-folder.c:837
-#: camel/providers/imap/camel-imap-folder.c:999
+#: camel/providers/imap/camel-imap-folder.c:986
+#: camel/providers/imap/camel-imap-folder.c:1197
+#, fuzzy
+msgid "This message is not currently available"
+msgstr ""
+"Esta mensaxe non ten asunto.\n"
+"�Enviar realmente?"
+
+#: camel/providers/imap/camel-imap-folder.c:1016
+#: camel/providers/imap/camel-imap-folder.c:1231
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Checking for new mail"
+msgstr "Crear un novo contacto"
 
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Check for new messages in all folders"
+msgstr "Marcando mensaxes na carpeta \"%s\""
+
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+msgid "Folders"
+msgstr "Carpetas"
+
+#: camel/providers/imap/camel-imap-provider.c:50
+#, fuzzy
+msgid "Show only subscribed folders"
+msgstr "Abrindo as mensaxes da carpeta \"%s\""
+
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:54
 #, fuzzy
-msgid "Secure IMAPv4"
+msgid "Namespace"
+msgstr "Nome:"
+
+#: 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:61
-msgid "For reading and storing mail on IMAP servers over an SSL connection."
+#: 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:263
+#: camel/providers/imap/camel-imap-provider.c:82
 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:415
+#: camel/providers/imap/camel-imap-store.c:440
 #, fuzzy, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Non se soporta o mecanismo de autenticaci�n solicitado."
 
-#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap/camel-imap-store.c:450
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autenticaci�n"
 
-#: camel/providers/imap/camel-imap-store.c:454
+#: camel/providers/imap/camel-imap-store.c:475
 #, 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:469
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:403
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:498
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: camel/providers/imap/camel-imap-store.c:518
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3683,90 +3999,99 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:772
+#: camel/providers/imap/camel-imap-store.c:865
+#, fuzzy, c-format
+msgid "%s is not a selectable folder"
+msgstr "Ver carpeta seleccionada"
+
+#: camel/providers/imap/camel-imap-store.c:879
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Non foi posible crear o directorio %s: %s"
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/imap/camel-imap-store.c:1382
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:39
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "`%s' non � un directorio."
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:40
 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:49
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:50
 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:59
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:128
+#: camel/providers/local/camel-local-store.c:129
 #, 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:136
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "`%s' non � un ficheiro regular."
 
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:144
+#: camel/providers/local/camel-local-store.c:160
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Non � posible facer un fork a %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:175
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:241
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Non foi posible renomear a carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:283
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Non foi posible borrar a carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:293
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Non foi posible borrar a carpeta `%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-maildir-folder.c:150
+#: camel/providers/local/camel-maildir-folder.c:158
+#: camel/providers/local/camel-maildir-folder.c:169
 #, fuzzy, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Non � posible engadir a mensaxe � carpeta mh: %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: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
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3775,20 +4100,20 @@ msgstr ""
 "Non � posible obter a mensaxe: %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:197
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
 #, fuzzy
 msgid "No such message"
 msgstr "Re-enviar esta mensaxe"
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:203
 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:96
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -3797,15 +4122,15 @@ msgstr ""
 "Non � posible abrir a carpeta `%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:100
+#: 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 "A carpeta `%s' non existe."
 
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3814,36 +4139,41 @@ msgstr ""
 "Non foi posible crear a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:120
+#: camel/providers/local/camel-maildir-store.c:122
 #, fuzzy, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' non � un directorio."
 
-#: 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:151
+#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Non foi posible borrar a carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:150
+#: camel/providers/local/camel-maildir-store.c:152
 #, fuzzy
 msgid "not a maildir directory"
 msgstr "`%s' non � un directorio."
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:152
+#, fuzzy, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "Non � posible facer un fork a %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:203
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Non � posible abrir a caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Non � posible engadir a mensaxe � carpeta mh: %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:335
+#: camel/providers/local/camel-mbox-folder.c:367
+#: camel/providers/local/camel-mbox-folder.c:380
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3852,15 +4182,15 @@ msgstr ""
 "Non � posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:368
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:381
 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"
@@ -3869,7 +4199,7 @@ msgstr ""
 "Non foi posible abrir o ficheiro `%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"
@@ -3878,14 +4208,14 @@ msgstr ""
 "Non foi posible crear o ficheiro `%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' non � un ficheiro regular."
 
-#: 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"
@@ -3894,117 +4224,117 @@ msgstr ""
 "Non foi posible borrar a carpeta `%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 "A carpeta `%s' non est� baleira. Non borrada."
 
 #. 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:248
 #, fuzzy
 msgid "Summarising folder"
 msgstr "Sincronizando \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:245
+#: camel/providers/local/camel-mbox-summary.c:253
 #, fuzzy, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 "Non � posible abrir a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:287
+#: camel/providers/local/camel-mbox-summary.c:295
 #, 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:370
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Non � posible facer un fork a %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
+#: camel/providers/local/camel-mbox-summary.c:501
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Sincronizando \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:506
+#: camel/providers/local/camel-mbox-summary.c:707
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 "Non � posible abrir a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:523
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Non � posible abrir a caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
 #: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:556
 #: camel/providers/local/camel-mbox-summary.c:745
+#: camel/providers/local/camel-mbox-summary.c:753
 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:599
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erro escribindo � caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:608
+#: camel/providers/local/camel-mbox-summary.c:616
 #, fuzzy, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Erro escribindo � caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
+#: camel/providers/local/camel-mbox-summary.c:634
+#: camel/providers/local/camel-mbox-summary.c:803
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Non foi posible pechar a carpeta orixe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:643
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Non foi posible pechar a carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:646
+#: camel/providers/local/camel-mbox-summary.c:654
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posible renomear a carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:870
+#: camel/providers/local/camel-mbox-summary.c:878
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro desco�ecido: %s"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:149
+#: camel/providers/local/camel-mh-folder.c:157
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Non � posible engadir a mensaxe � carpeta mh: %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' non � un directorio."
 
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: 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:62
+#: camel/providers/nntp/camel-nntp-auth.c:66
 msgid "Server rejected username"
 msgstr "O servidor rexeitou o nome de usuario"
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:72
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:81
 msgid "Server rejected username/password"
 msgstr "O servidor rexeitou o nome de usuario/contrasinal"
 
@@ -4028,11 +4358,11 @@ msgstr ""
 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 ""
 
@@ -4059,35 +4389,50 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:145
+#: camel/providers/pop3/camel-pop3-folder.c:149
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:188
+#: camel/providers/pop3/camel-pop3-folder.c:192
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:282
+#: camel/providers/pop3/camel-pop3-folder.c:285
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:286
+#: camel/providers/pop3/camel-pop3-folder.c:289
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:304
+#: camel/providers/pop3/camel-pop3-folder.c:307
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
+#, fuzzy
+msgid "Message storage"
+msgstr "Corpo da Mensaxe"
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+#, fuzzy
+msgid "Leave messages on server"
+msgstr "Non borrar as mensaxes do servidor"
+
+#: camel/providers/pop3/camel-pop3-provider.c:41
+#, fuzzy, c-format
+msgid "Delete after %s day(s)"
+msgstr "Borrar a tarefa"
+
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
 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."
@@ -4096,22 +4441,7 @@ msgstr ""
 "recibir correo de certos provedores de correo web, e de sistemas de email "
 "propietarios."
 
-#: camel/providers/pop3/camel-pop3-provider.c:54
-msgid "Secure POP"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:56
-#, fuzzy
-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 ""
-"Para conectarse a servidores POP. O protocolo POP tam�n se pode usar para "
-"recibir correo de certos provedores de correo web, e de sistemas de email "
-"propietarios."
-
-#: camel/providers/pop3/camel-pop3-store.c:147
+#: 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."
@@ -4119,7 +4449,7 @@ msgstr ""
 "Esta opci�n conectarase � servidor POP usando un contrasinal sen cifrar. "
 "Esta � a �nica opci�n que soportan moitos servidores POP."
 
-#: camel/providers/pop3/camel-pop3-store.c:157
+#: 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 "
@@ -4129,28 +4459,28 @@ msgstr ""
 "trav�s do protocolo APOP. Pode que isto non funcione para t�dolos usuarios, "
 "mesmo naqueles que indican que o soportan."
 
-#: camel/providers/pop3/camel-pop3-store.c:169
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Isto conectarase � servidor POP e usar� Kerberos 4 para autenticarse con el."
 
-#: camel/providers/pop3/camel-pop3-store.c:214
+#: camel/providers/pop3/camel-pop3-store.c:207
 #, 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:331
+#: camel/providers/pop3/camel-pop3-store.c:319
 #, 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:378
+#: camel/providers/pop3/camel-pop3-store.c:358
 #, 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:397
+#: camel/providers/pop3/camel-pop3-store.c:377
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4159,12 +4489,12 @@ msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o nome de usuario: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:400
-#: camel/providers/pop3/camel-pop3-store.c:437
+#: camel/providers/pop3/camel-pop3-store.c:380
+#: camel/providers/pop3/camel-pop3-store.c:417
 msgid "(Unknown)"
 msgstr "(Desco�ecido)"
 
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:407
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4172,7 +4502,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:435
+#: camel/providers/pop3/camel-pop3-store.c:415
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4181,372 +4511,369 @@ msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o contrasinal: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Non existe a carpeta `%s'."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:57
 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 ""
 "Para entregar o correo pas�ndollo � 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 ""
 "Non foi posible crear unha canalizaci�n para o sendmail: %s: correo non "
 "enviado"
 
-#: 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 "Non foi posible facer fork para o sendmail: %s: correo non enviado"
 
-#: 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 "Non foi posible enviar a mensaxe: %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 "o sendmail sa�u co sinal %s: correo non enviado."
 
-#: 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 "Non foi posible executar %s: correo non enviado."
 
-#: 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 "o sendmail sa�u con estado %d: correo non enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
 #, fuzzy
 msgid "Could not find 'From' address in message"
 msgstr "Non foi posible enviar a mensaxe: %s"
 
-#: 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 "Entrega de correo a trav�s do programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
 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 ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:53
-msgid "Secure SMTP"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-provider.c:55
-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:147
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:175
 #, fuzzy
 msgid "Help message"
 msgstr "Editar Mensaxe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:177
 #, fuzzy
 msgid "Service ready"
 msgstr "Agochar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:207
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Non se indicou un contrasinal."
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:211
 #, fuzzy
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Non se soporta o mecanismo de autenticaci�n solicitado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:213
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autenticaci�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:215
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autenticaci�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:286
+#: camel/providers/smtp/camel-smtp-transport.c:305
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:348
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
+msgstr ""
+"Non foi posible conectarse � servidor POP.\n"
+"Non se soporta o mecanismo de autenticaci�n solicitado."
+
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIntroduza o contrasinal IMAP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:466
-#, fuzzy
-msgid "No authentication required"
-msgstr "Autenticaci�n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:468
-#, fuzzy
+#: camel/providers/smtp/camel-smtp-transport.c:411
+#, fuzzy, c-format
 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."
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
 msgstr ""
-"Esta opci�n conectarase � servidor POP usando un contrasinal sen cifrar. "
-"Esta � a �nica opci�n que soportan moitos servidores POP."
+"Non foi posible autenticarse co servidor IMAP.\n"
+"%s\n"
+"\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:511
+#: camel/providers/smtp/camel-smtp-transport.c:527
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:529
 #, fuzzy, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correo a trav�s do programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:554
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:561
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:559
+#: camel/providers/smtp/camel-smtp-transport.c:575
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
-#: camel/providers/smtp/camel-smtp-transport.c:719
+#: camel/providers/smtp/camel-smtp-transport.c:721
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:736
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Non foi posible executar %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:777
+#: camel/providers/smtp/camel-smtp-transport.c:798
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta non agardada do servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:824
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:821
+#: camel/providers/smtp/camel-smtp-transport.c:843
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:846
+#: camel/providers/smtp/camel-smtp-transport.c:868
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "Non foi posible crear unha canalizaci�n para o sendmail: %s: correo non "
 "enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:865
+#: camel/providers/smtp/camel-smtp-transport.c:887
 #, fuzzy, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Non foi posible executar %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:896
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Non foi posible executar %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:915
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, fuzzy, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Non foi posible facer fork para o sendmail: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:930
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:952
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "o sendmail sa�u co sinal %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:967
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:1013
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1010
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Erro desco�ecido: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1033
+#: camel/providers/smtp/camel-smtp-transport.c:1055
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1052
+#: camel/providers/smtp/camel-smtp-transport.c:1074
 #, 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:95
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:97
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:112
 #, 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:113
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:413
+#: 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:461
+#: composer/e-msg-composer-attachment-bar.c:469
 msgid "Remove selected items from the attachment list"
 msgstr "Quitar os elementos seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Add attachment..."
 msgstr "Engadir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:501
 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:1171
-#: ui/evolution-mail.xml.h:1
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
 #, fuzzy
 msgid "Attachment"
 msgstr "anexo"
@@ -4573,52 +4900,52 @@ msgstr "Tipo MIME:"
 msgid "Send as:"
 msgstr "Autor"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:321
 msgid "Click here for the address book"
 msgstr "Prema aqu� para o libro de enderezos"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:377
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:381
+#: composer/e-msg-composer-hdrs.c:388
 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:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:392
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4626,7 +4953,7 @@ msgstr ""
 "Introduza os enderezos que recibir�n unha copia da mensaxe sen apareceren na "
 "lista de destinatarios."
 
-#: composer/e-msg-composer.c:518
+#: composer/e-msg-composer.c:528
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4635,26 +4962,32 @@ msgstr ""
 "Non foi posible abrir o ficheiro de sinatura %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:706
+#: composer/e-msg-composer.c:716
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: composer/e-msg-composer.c:717
+#: composer/e-msg-composer.c:727
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:737
+#: composer/e-msg-composer.c:747
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
+#: composer/e-msg-composer.c:819
+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:824
+#: composer/e-msg-composer.c:883
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4664,27 +4997,27 @@ msgstr ""
 "\n"
 "�Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:849
+#: composer/e-msg-composer.c:908
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:975
+#: composer/e-msg-composer.c:1034
 msgid "That file does not exist."
 msgstr "O ficheiro non existe."
 
-#: composer/e-msg-composer.c:985
+#: composer/e-msg-composer.c:1044
 msgid "That is not a regular file."
 msgstr "Non � un ficheiro normal."
 
-#: composer/e-msg-composer.c:995
+#: composer/e-msg-composer.c:1054
 msgid "That file exists but is not readable."
 msgstr "O ficheiro existe pero non se pode ler."
 
-#: composer/e-msg-composer.c:1005
+#: composer/e-msg-composer.c:1064
 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:1027
+#: composer/e-msg-composer.c:1086
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4692,25 +5025,25 @@ msgstr ""
 "O ficheiro � moi longo (m�is de 100K).\n"
 "�Est� seguro de querer inserilo?"
 
-#: composer/e-msg-composer.c:1048
+#: composer/e-msg-composer.c:1107
 msgid "An error occurred while reading the file."
 msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
+#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
 msgid "Compose a message"
 msgstr "Compo�er unha mensaxe"
 
-#: composer/e-msg-composer.c:1765
+#: composer/e-msg-composer.c:1829
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:352
+#: 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:367
+#: composer/evolution-composer.c:370
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
@@ -4730,55 +5063,81 @@ msgid "calendar information"
 msgstr "Sen Informaci�n"
 
 #. 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:69 e-util/e-time-utils.c:117
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
 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:86 e-util/e-time-utils.c:197
+#: 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:89 e-util/e-time-utils.c:200
+#: 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:93 e-util/e-time-utils.c:204
+#: 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:96 e-util/e-time-utils.c:207
+#: 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:267
-#: 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:269
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
 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:272
+#: e-util/e-time-utils.c:274
 #, 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:281
+#: e-util/e-time-utils.c:283
 #, 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
 msgid "Evolution component for the executive summary."
 msgstr ""
@@ -4858,7 +5217,7 @@ msgstr "Ir � elemento seguinte"
 msgid "Configure %s"
 msgstr "_Configurar Carpeta"
 
-#: executive-summary/component/e-summary.c:918
+#: executive-summary/component/e-summary.c:924
 #, fuzzy, c-format
 msgid ""
 "Cannot open the HTML file:\n"
@@ -4867,14 +5226,14 @@ msgstr ""
 "Non foi posible abrir o ficheiro %s:\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:932
+#: executive-summary/component/e-summary.c:938
 #, fuzzy, c-format
 msgid ""
 "Error reading data:\n"
 "%s"
 msgstr "Erro lendo o ficheiro de correo: %s"
 
-#: executive-summary/component/e-summary.c:950
+#: executive-summary/component/e-summary.c:956
 msgid "File does not have a place for the services.\n"
 msgstr ""
 
@@ -4886,7 +5245,7 @@ msgstr ""
 msgid "Background:"
 msgstr ""
 
-#: executive-summary/component/main.c:60
+#: 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"
@@ -4920,101 +5279,101 @@ msgstr ""
 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
+#: 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 "Sen erro"
 
-#: executive-summary/test-service/rdf-summary.c:765
+#: executive-summary/test-service/rdf-summary.c:768
 msgid "Update automatically"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:775
+#: executive-summary/test-service/rdf-summary.c:778
 msgid "Update now"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:785
+#: executive-summary/test-service/rdf-summary.c:788
 msgid "Update every "
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
+#: executive-summary/test-service/rdf-summary.c:796
+#: filter/filter-datespec.c:83
 msgid "minutes"
 msgstr "minutos"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "year"
 msgstr "ano"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "years"
 msgstr "anos"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "month"
 msgstr "mes"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "months"
 msgstr "meses"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "week"
 msgstr "semana"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "weeks"
 msgstr "semanas"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:81
 msgid "days"
 msgstr "d�as"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hour"
 msgstr "hora"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hours"
 msgstr "horas"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:83
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "second"
 msgstr "segundo"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "seconds"
 msgstr "segundos"
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:199
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Oops. Esqueceu escoller unha data."
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:201
 msgid "Oops. You have chosen an invalid date."
 msgstr "Oops. Escolleu unha data non v�lida."
 
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:275
 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:298
 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:338
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5022,67 +5381,64 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "the current time"
 msgstr "a hora actual"
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "a time you specify"
 msgstr "unha hora que especifique"
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:374
 msgid "a time relative to the current time"
 msgstr "unha relativa � momento actual"
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:432
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
 msgid "now"
 msgstr "agora"
 
-#: filter/filter-datespec.c:690
+#: filter/filter-datespec.c:706
 msgid "<click here to select a date>"
 msgstr "<prema aqu� para seleccionar unha data>"
 
-#: filter/filter-editor.c:126 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "Reglas de Filtrado"
 
 #. and now for the action area
-#: filter/filter-filter.c:424
+#: filter/filter-filter.c:453
 msgid "Then"
 msgstr "Ent�n"
 
-#: filter/filter-filter.c:437
+#: filter/filter-filter.c:467
 msgid "Add action"
 msgstr "Engadir acci�n"
 
-#: filter/filter-filter.c:443
-msgid "Remove action"
-msgstr "Eliminar acci�n"
-
-#: 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:279
+#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
+#: mail/mail-account-gui.c:682
 msgid "Select Folder"
 msgstr "Seleccionar Carpeta"
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:247
 msgid "Enter folder URI"
 msgstr "Introduza o URI da carpeta"
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:293
 msgid "<click here to select a folder>"
 msgstr "<prema aqu� para seleccionar unha carpeta>"
 
-#: filter/filter-input.c:189
+#: filter/filter-input.c:194
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5091,58 +5447,38 @@ msgstr ""
 "Erro na expresi�n regular '%s':\n"
 "%s"
 
-#: filter/filter-part.c:467
+#: filter/filter-part.c:475
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:597
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Nome da regra: "
 
-#: filter/filter-rule.c:601
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "Sen_t�tulo"
 
-#: filter/filter-rule.c:617
+#: filter/filter-rule.c:646
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:634
+#: filter/filter-rule.c:664
 msgid "Execute actions"
 msgstr "Executar acci�ns"
 
-#: filter/filter-rule.c:638
+#: filter/filter-rule.c:668
 msgid "if all criteria are met"
 msgstr "se se cumpren t�dolos criterios"
 
-#: filter/filter-rule.c:643
+#: filter/filter-rule.c:673
 msgid "if any criteria are met"
 msgstr "se se cumpre alg�n criterio"
 
-#: filter/filter-rule.c:654
+#: filter/filter-rule.c:684
 msgid "Add criterion"
 msgstr "Engadir criterio"
 
-#: filter/filter-rule.c:660
-msgid "Remove criterion"
-msgstr "Eliminar criterio"
-
-#: filter/filter-system-flag.c:67
-#, fuzzy
-msgid "Replied to"
-msgstr "Responder a Todos"
-
-#. { N_("Deleted"), "Deleted" },
-#. { N_("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr ""
-
-#: filter/filter-system-flag.c:71
-#, fuzzy
-msgid "Read"
-msgstr "Refacer"
-
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Editar Filtros"
@@ -5166,7 +5502,7 @@ msgstr ""
 "Entrante\n"
 "Sa�nte\n"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Carpetas Virtuais"
 
@@ -5193,288 +5529,327 @@ msgstr ""
 msgid "with all local folders"
 msgstr "Crear unha nova carpeta"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Asignar Cor"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Asignar Puntuaci�n"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 #, fuzzy
 msgid "Attachments"
 msgstr "anexo"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "cont�n"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Copiar � Carpeta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Data de recepci�n"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Data de env�o"
 
-#: filter/libfilter-i18n.h:12
-msgid "does not contain"
-msgstr "non cont�n"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not end with"
-msgstr "non termina en"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not exist"
-msgstr "non existe"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:16
-msgid "does not start with"
-msgstr "non empeza por"
+#: filter/libfilter-i18n.h:9
+#, fuzzy
+msgid "Deleted"
+msgstr "Eliminar"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:10
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "non existe"
 
-#: filter/libfilter-i18n.h:18
-msgid "ends with"
-msgstr "termina en"
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Draft"
+msgstr "Pegar"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Exist"
 msgstr "_Sa�r"
 
-#: filter/libfilter-i18n.h:20
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Expresi�n"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Forward to Address"
 msgstr "Reenviar � Enderezo"
 
-#: filter/libfilter-i18n.h:23
-msgid "is"
-msgstr "�"
-
-#: filter/libfilter-i18n.h:24
-msgid "is greater than"
-msgstr "� maior que"
-
-#: filter/libfilter-i18n.h:25
-msgid "is less than"
-msgstr "� menor que"
+#: filter/libfilter-i18n.h:15
+msgid "Important"
+msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "is not"
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "Is Not"
 msgstr "non �"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Is"
+msgstr "Se"
+
+#: filter/libfilter-i18n.h:18
 #, fuzzy
 msgid "Mailing list"
 msgstr "lista de correo %s"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:19
 msgid "Message Body"
 msgstr "Corpo da Mensaxe"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:20
 #, fuzzy
 msgid "Message Header"
 msgstr "Corpo da Mensaxe"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:21
 msgid "Message was received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:22
 msgid "Message was sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:23
 msgid "Move to Folder"
 msgstr "Mover para a Carpeta"
 
-#: filter/libfilter-i18n.h:33
-msgid "on or after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
-msgid "on or before"
-msgstr ""
+#: filter/libfilter-i18n.h:24
+#, fuzzy
+msgid "Read"
+msgstr "Refacer"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:25
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:26
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1171
+#: filter/libfilter-i18n.h:27
+#, fuzzy
+msgid "Replied to"
+msgstr "Responder a Todos"
+
+#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
+#: mail/message-list.c:1052
 msgid "Score"
 msgstr "Puntuaci�n"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:29
+msgid "Sender"
+msgstr "Autor"
+
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "Set Status"
 msgstr "_Estado:"
 
-#: filter/libfilter-i18n.h:40
-msgid "sounds like"
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "Source Account"
+msgstr "Contas"
+
+#: filter/libfilter-i18n.h:32
+msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
-msgid "Source"
+#: filter/libfilter-i18n.h:34
+msgid "Stop Processing"
 msgstr ""
 
+#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
+msgid "Subject"
+msgstr "Asunto"
+
+#: filter/libfilter-i18n.h:38
+msgid "contains"
+msgstr "cont�n"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not contain"
+msgstr "non cont�n"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not end with"
+msgstr "non termina en"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not exist"
+msgstr "non existe"
+
 #: filter/libfilter-i18n.h:42
-msgid "Specific header"
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
-msgid "starts with"
-msgstr ""
+msgid "does not start with"
+msgstr "non empeza por"
+
+#: filter/libfilter-i18n.h:44
+msgid "ends with"
+msgstr "termina en"
 
 #: filter/libfilter-i18n.h:45
-msgid "Stop Processing"
-msgstr ""
+msgid "exists"
+msgstr "existe"
 
-#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
-msgid "Subject"
-msgstr "Asunto"
+#: filter/libfilter-i18n.h:46
+msgid "is greater than"
+msgstr "� maior que"
 
 #: filter/libfilter-i18n.h:47
+msgid "is less than"
+msgstr "� menor que"
+
+#: filter/libfilter-i18n.h:48
+msgid "is not"
+msgstr "non �"
+
+#: filter/libfilter-i18n.h:49
+msgid "is"
+msgstr "�"
+
+#: filter/libfilter-i18n.h:50
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:51
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:52
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:53
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:54
 msgid "was after"
 msgstr "foi posterior a"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:55
 msgid "was before"
 msgstr "foi anterior a"
 
-#: filter/score-editor.c:126
+#: filter/score-editor.c:130
 #, fuzzy
 msgid "Score Rules"
 msgstr "Puntuaci�n"
 
-#: mail/component-factory.c:306
+#: mail/component-factory.c:329
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#: mail/component-factory.c:379
+#: mail/component-factory.c:402
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:237
+#: mail/folder-browser-factory.c:209
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades"
 
-#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:219
+#: mail/folder-browser.c:225
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "Seleccionar Carpeta"
 
-#: mail/folder-browser.c:509
+#: mail/folder-browser.c:533
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:512
+#: mail/folder-browser.c:536
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:515
+#: mail/folder-browser.c:539
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:518 mail/folder-browser.c:702
+#: mail/folder-browser.c:542 mail/folder-browser.c:733
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:524
+#: mail/folder-browser.c:548
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:527
+#: mail/folder-browser.c:551
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:530
+#: mail/folder-browser.c:554
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:533 mail/folder-browser.c:701
+#: mail/folder-browser.c:557 mail/folder-browser.c:732
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:544
+#: mail/folder-browser.c:568
+#, fuzzy
+msgid "Resend"
+msgstr "segundo"
+
+#: mail/folder-browser.c:570
 #, fuzzy
 msgid "Save As..."
 msgstr "Gardar _Como..."
 
-#: mail/folder-browser.c:546 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Imprimir"
-
-#: mail/folder-browser.c:551
+#: mail/folder-browser.c:577
 msgid "Reply to Sender"
 msgstr "Responder � Autor"
 
-#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
+#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
-#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
+#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
 msgid "Forward"
 msgstr "Re-enviar"
 
-#: mail/folder-browser.c:557
+#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
 #, fuzzy
 msgid "Forward inline"
 msgstr "Ir para diante no tempo"
 
-#: mail/folder-browser.c:560
+#: mail/folder-browser.c:586
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:562
+#: mail/folder-browser.c:588
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:567
+#: mail/folder-browser.c:593
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Mover para a Carpeta"
 
-#: mail/folder-browser.c:569
+#: mail/folder-browser.c:595
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Copiar � Carpeta"
 
-#: mail/folder-browser.c:573
+#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
 #, fuzzy
 msgid "Undelete"
 msgstr "Eliminar"
@@ -5483,20 +5858,20 @@ msgstr "Eliminar"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:583
+#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
 msgid "Apply Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:587
+#: mail/folder-browser.c:613
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:735
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:705
+#: mail/folder-browser.c:736
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
@@ -5576,19 +5951,28 @@ msgstr ""
 msgid "mh"
 msgstr "h"
 
-#: mail/mail-accounts.c:116
+#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
 #, fuzzy
 msgid " (default)"
 msgstr "Eliminar"
 
-#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#: mail/mail-accounts.c:197
+#, fuzzy
+msgid "Disable"
+msgstr "Desactivar."
+
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+msgid "Enable"
+msgstr ""
+
+#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 "�Est� seguro de que quere\n"
 "borrar este contacto?"
 
-#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
@@ -5596,52 +5980,46 @@ msgstr ""
 "borrar este contacto?"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:423
+#: mail/mail-accounts.c:536
 #, fuzzy
 msgid "Evolution Account Manager"
 msgstr "Xesti�n e Contas"
 
-#: mail/mail-account-editor.c:307
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
+#: 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:706
+#: mail/mail-account-editor.c:173
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Instalaci�n de Evolution"
 
-#: mail/mail-account-editor.c:727
-msgid "Unspecified"
-msgstr ""
-
-#: mail/mail-autofilter.c:71
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Enviar por correo a %s"
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, c-format
 msgid "Subject is %s"
 msgstr "O asunto � %s"
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr "Enviar dende %s"
 
-#: mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
 msgid "Add Filter Rule"
 msgstr "Engadir Regra de Filtrado"
 
-#: mail/mail-callbacks.c:85
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5649,7 +6027,7 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5657,17 +6035,17 @@ msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: mail/mail-callbacks.c:150
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:202
 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:227
+#: mail/mail-callbacks.c:235
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5675,36 +6053,36 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "�Enviar realmente?"
 
-#: mail/mail-callbacks.c:294
+#: mail/mail-callbacks.c:308
+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:351
 #, fuzzy
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: mail/mail-callbacks.c:316
-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:579
+#: mail/mail-callbacks.c:591
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:761
+#: mail/mail-callbacks.c:773
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-callbacks.c:864
+#: mail/mail-callbacks.c:876
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:866
+#: mail/mail-callbacks.c:878
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1007
+#: mail/mail-callbacks.c:1019
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5712,11 +6090,20 @@ msgstr ""
 "S� pode editar mensaxes gardados\n"
 "na carpeta de Borrador."
 
-#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1056
+#, fuzzy
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+"S� pode editar mensaxes gardados\n"
+"na carpeta de Borrador."
+
+#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
 msgid "Overwrite file?"
 msgstr "�Sobrescribir ficheiro?"
 
-#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5724,17 +6111,17 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "�Sobrescribilo?"
 
-#: mail/mail-callbacks.c:1088
+#: mail/mail-callbacks.c:1137
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Gardar como..."
 
-#: mail/mail-callbacks.c:1090
+#: mail/mail-callbacks.c:1139
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Gardar como..."
 
-#: mail/mail-callbacks.c:1204
+#: mail/mail-callbacks.c:1253
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5743,50 +6130,61 @@ msgstr ""
 "Erro cargando a informaci�n do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1349
 msgid "Printing of message failed"
 msgstr "A impresi�n da mensaxe fallou"
 
+#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#, fuzzy
+msgid "Connecting to server..."
+msgstr "Non foi posible conectarse � servidor POP en %s."
+
 #: mail/mail-config.glade.h:1
 #, fuzzy
+msgid " Check for supported types "
+msgstr "Detectar tipos soportados..."
+
+#: mail/mail-config.glade.h:2
+#, fuzzy
+msgid " color"
+msgstr "Cores"
+
+#: mail/mail-config.glade.h:3
+#, fuzzy
 msgid "Account"
 msgstr "Contas"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "Informaci�n de Contas"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "Account Management"
 msgstr "Xesti�n e Contas"
 
-#: mail/mail-config.glade.h:5
-msgid "Advanced"
-msgstr ""
-
 #: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "Accounts"
+msgstr "Contas"
+
+#: mail/mail-config.glade.h:8
 msgid "Authentication"
 msgstr "Autenticaci�n"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 #, fuzzy
-msgid "Authentication Type:"
+msgid "Authentication Type: "
 msgstr "Autenticaci�n:"
 
-#: mail/mail-config.glade.h:9
-msgid "Automatically check mail every"
+#: mail/mail-config.glade.h:10
+msgid "Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-#, fuzzy
-msgid "Check settings"
-msgstr "Probar Configuraci�n"
-
 #: mail/mail-config.glade.h:12
 #, fuzzy
 msgid ""
@@ -5800,220 +6198,186 @@ msgstr ""
 "A configuraci�n do correo electr�nico est� completa.\n"
 "Prema \"Finalizar\" para gardar a nova configuraci�n"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "De_fault"
 msgstr "Eliminar"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Done"
 msgstr "mes"
 
-#: mail/mail-config.glade.h:23
-msgid "Email Address:"
-msgstr "Enderezo de Email:"
+#: mail/mail-config.glade.h:21
+#, fuzzy
+msgid "Drafts"
+msgstr "Pegar"
 
-#: mail/mail-config.glade.h:24
-msgid "Email address:"
-msgstr "Enderezo de email:"
+#: mail/mail-config.glade.h:22
+#, fuzzy
+msgid "Drafts folder:"
+msgstr "Creando unha nova carpeta"
 
-#: mail/mail-config.glade.h:25
-msgid "Evolution Mail Configuration"
-msgstr "Configuraci�n de Correo do Evolution"
+#: mail/mail-config.glade.h:24
+msgid "Email Address:"
+msgstr "Enderezo de Email:"
 
 #: mail/mail-config.glade.h:26
 msgid "Full Name:"
 msgstr "Nome Completo:"
 
+#: mail/mail-config.glade.h:27
+msgid "Highlight citations with "
+msgstr ""
+
 #: mail/mail-config.glade.h:29
 #, fuzzy
-msgid "Hostname:"
-msgstr "Nome de usuario:"
+msgid "IMAPv4 "
+msgstr "IMAPv4"
 
 #: mail/mail-config.glade.h:30
-msgid "IMAP"
-msgstr "IMAP"
-
-#: mail/mail-config.glade.h:31
 msgid "Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:32
-msgid "Include this account when receiving mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:33
-#, fuzzy
-msgid "Keep mail on server"
-msgstr "Non borrar as mensaxes do servidor"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 #, fuzzy
-msgid "Kerberos"
+msgid "Kerberos "
 msgstr "Kerberos 4"
 
-#: mail/mail-config.glade.h:35
-msgid "Mail"
-msgstr "Correo"
-
-#: mail/mail-config.glade.h:36
-#, fuzzy
-msgid "Mail Account"
-msgstr "Contas"
-
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:32
 msgid "Mail Configuration"
 msgstr "Configuraci�n do Correo"
 
-#: mail/mail-config.glade.h:38
-msgid "Mail Configuration Druid"
-msgstr "Axudante da Configuraci�n do Correo"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid "Mark messages as \"Read\" after:"
 msgstr "Marcar mensaxe como lida [ms]: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:36
 msgid "News"
 msgstr "Novas"
 
-#: mail/mail-config.glade.h:44
-msgid "Optional"
-msgstr "Opcional"
+#: mail/mail-config.glade.h:38
+#, fuzzy
+msgid "Optional Information"
+msgstr "Sen Informaci�n"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:39
 msgid "Organization:"
 msgstr "Organizaci�n:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:41
 msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
-msgid "Password:"
-msgstr "Contrasinal:"
-
-#: mail/mail-config.glade.h:50
-msgid "Plain Text"
-msgstr ""
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Qmail maildir "
+msgstr "Correo Electr�nico 2"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:48
 #, fuzzy
-msgid "Remember my password"
-msgstr "Gardar como VCard"
+msgid "Receiving Mail"
+msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:49
 #, fuzzy
-msgid "Reply address:"
-msgstr "Enderezo de email:"
+msgid "Receiving Options"
+msgstr "Data de recepci�n"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Required Information"
+msgstr "Sen Informaci�n"
+
+#: mail/mail-config.glade.h:53
+msgid "Select PGP binary"
+msgstr ""
 
 #: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "Required"
-msgstr "Persoas _Requiridas"
+msgid "Send mail in HTML format by default."
+msgstr "Enviar mensaxes en formato HTML"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Save password"
-msgstr "Gardar como VCard"
+msgid "Sending Email"
+msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:57
-msgid "Select PGP binary"
-msgstr ""
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Enviando Correo"
 
 #: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Select signature file"
-msgstr "Ficheiro de sinatura:"
+msgid "Sent"
+msgstr "Autor"
 
 #: mail/mail-config.glade.h:59
 #, fuzzy
-msgid "Send mail in HTML format by default."
-msgstr "Enviar mensaxes en formato HTML"
+msgid "Sent and Draft Messages"
+msgstr "Axenda"
 
 #: mail/mail-config.glade.h:60
 #, fuzzy
-msgid "Sending Email"
-msgstr "Enviando Correo"
+msgid "Sent messages folder:"
+msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:61
 msgid "Server Configuration"
 msgstr "Configuraci�n do Servidor"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:62
 msgid "Server Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Server requires authentication"
 msgstr "O servidor SMTP require autenticaci�n"
 
-#: mail/mail-config.glade.h:65
-#, fuzzy
-msgid "Server type:"
-msgstr "Tipo de Servidor: "
-
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Signature file:"
 msgstr "Ficheiro de sinatura:"
 
-#: mail/mail-config.glade.h:67
-#, fuzzy
-msgid "Signature:"
-msgstr "Ficheiro de sinatura:"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:65
 msgid "Sources"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:70
-#, fuzzy
-msgid "This server requires a secure connection (SSL)"
-msgstr "O servidor SMTP require autenticaci�n"
-
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:66
 #, fuzzy
-msgid "Transport"
-msgstr "Transparente"
+msgid "Special Folders"
+msgstr "Carpetas Virtuais"
 
-#: mail/mail-config.glade.h:72
-#, fuzzy
-msgid "Transport Authentication"
-msgstr "Autenticaci�n"
+#: mail/mail-config.glade.h:67
+msgid "Standard Unix mbox"
+msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Type"
 msgstr "Tipo:"
 
-#: mail/mail-config.glade.h:74
-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:75
+#: mail/mail-config.glade.h:69
 #, fuzzy
-msgid "User Information"
-msgstr "Sen Informaci�n"
+msgid "Use secure connection (SSL)"
+msgstr "O servidor SMTP require autenticaci�n"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:70
 msgid "Username:"
 msgstr "Nome de usuario:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
@@ -6021,186 +6385,211 @@ msgid ""
 "Click \"Next\" to begin. "
 msgstr "�Benvido � axudante da Configuraci�n de Correo do Evolution!"
 
-#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: 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:28
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
 msgid "_Edit"
 msgstr "_Editar"
 
-#: mail/mail-config.glade.h:83
-#, fuzzy
-msgid "minutes."
-msgstr "minutos"
+#: 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:421
-#, c-format
+#: mail/mail-config-druid.c:101
 msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+"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:515
-#, fuzzy
-msgid "Namespace:"
-msgstr "Nome:"
+#: 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:708
-#, c-format
+#: mail/mail-config-druid.c:107
 msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+"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:1215
+#: mail/mail-config-druid.c:445
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-display.c:189
+#: mail/mail-display.c:194
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:229
+#: 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:290
+#: mail/mail-display.c:295
 msgid "Save to Disk..."
 msgstr "Gardar � Disco..."
 
-#: mail/mail-display.c:292
+#: mail/mail-display.c:297
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:294
+#: mail/mail-display.c:299
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:323
+#: mail/mail-display.c:334
 msgid "External Viewer"
 msgstr "Visualizador Externo"
 
-#: mail/mail-display.c:346
+#: mail/mail-display.c:357
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:361
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-format.c:506
+#: mail/mail-display.c:1102
+#, fuzzy
+msgid "Open link in browser"
+msgstr "Abrir nunha Nova Fiestra"
+
+#: mail/mail-display.c:1104
+#, fuzzy
+msgid "Save as (FIXME)"
+msgstr "_Tarefa (FIXME)"
+
+#: mail/mail-display.c:1106
+#, fuzzy
+msgid "Copy location (FIXME)"
+msgstr "_Contacto (FIXME)"
+
+#: mail/mail-format.c:518
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:704
+#: mail/mail-format.c:560
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+
+#: mail/mail-format.c:742
 #, fuzzy
 msgid "Loading message content"
 msgstr "Reenviando mensaxes \"%s\""
 
-#: mail/mail-format.c:993
+#: mail/mail-format.c:1046
 msgid "Encrypted message not displayed"
 msgstr "Mensaxe cifrada non visualizada"
 
-#: mail/mail-format.c:999
+#: mail/mail-format.c:1052
 msgid "Encrypted message"
 msgstr "Mensaxe cifrada"
 
-#: mail/mail-format.c:1000
+#: mail/mail-format.c:1053
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1069 mail/mail-format.c:1456
+#: mail/mail-format.c:1137 mail/mail-format.c:1526
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1077 mail/mail-format.c:1464
+#: mail/mail-format.c:1145 mail/mail-format.c:1534
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1677
+#: mail/mail-format.c:1747
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1689
+#: mail/mail-format.c:1759
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1693
+#: mail/mail-format.c:1763
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1727
+#: mail/mail-format.c:1797
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1732
+#: mail/mail-format.c:1802
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:335
+#: mail/mail-local.c:337
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Non existe a carpeta `%s'."
 
-#: mail/mail-local.c:508
+#: mail/mail-local.c:509
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "Abrir en %s..."
 
-#: mail/mail-local.c:786
+#: mail/mail-local.c:787
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando a carpeta \"%s\" � formato \"%s\""
 
-#: mail/mail-local.c:790
+#: mail/mail-local.c:791
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Cambiar carpeta \"%s\" � formato \"%s\""
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:815
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Configurar Carpeta"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:843
+#: mail/mail-local.c:844
 msgid "Closing current folder"
 msgstr "Pechando a carpeta actual"
 
-#: mail/mail-local.c:875
+#: mail/mail-local.c:876
 msgid "Renaming old folder and opening"
 msgstr "Renomeando a carpeta antiga e abrindo"
 
-#: mail/mail-local.c:893
+#: mail/mail-local.c:894
 msgid "Creating new folder"
 msgstr "Creando unha nova carpeta"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:908
 msgid "Copying messages"
 msgstr "Copiando as mensaxes"
 
-#: mail/mail-local.c:928
+#: mail/mail-local.c:925
 #, 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:964
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:177
+#: mail/mail-mt.c:190
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6209,7 +6598,7 @@ msgstr ""
 "Erro na expresi�n regular '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:179
+#: mail/mail-mt.c:192
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6218,408 +6607,388 @@ msgstr ""
 "Erro cargando a informaci�n do filtro:\n"
 "%s"
 
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
+#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
 #, fuzzy
 msgid "Working"
 msgstr "Movendo"
 
-#: mail/mail-mt.c:666 mail/session.c:91
+#: mail/mail-mt.c:679 mail/session.c:98
 msgid "Do you accept?"
 msgstr ""
 
-#: mail/mail-mt.c:860
+#: mail/mail-mt.c:873
 #, fuzzy
 msgid "Evolution progress"
 msgstr "Evolution"
 
-#: mail/mail-ops.c:516
+#: mail/mail-ops.c:587
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:518
+#: mail/mail-ops.c:589
 #, fuzzy
 msgid "Sending message"
 msgstr "Borrar esta mensaxe"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:704
+#, fuzzy, c-format
+msgid "Sending message %d of %d"
+msgstr "Escribindo a mensaxe %d de %d"
+
+#: mail/mail-ops.c:723
+#, fuzzy, c-format
+msgid "Failed on message %d of %d"
+msgstr "Marcando a mensaxe %d de %d"
+
+#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#, fuzzy
+msgid "Complete."
+msgstr "% Comp_leta:"
+
+#: mail/mail-ops.c:811
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes"
 
-#: mail/mail-ops.c:842
+#: mail/mail-ops.c:900
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:903
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:856
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s mensaxe %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:978
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1085
+#: mail/mail-ops.c:1139
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
+#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1193
+#: mail/mail-ops.c:1247
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1380
+#: mail/mail-ops.c:1434
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1429
+#: mail/mail-ops.c:1483
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/mail-ops.c:1496
+#: mail/mail-ops.c:1550
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1560
 #, 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:1580
+#: mail/mail-ops.c:1634
 #, fuzzy
 msgid "Saving messages"
 msgstr "Copiando as mensaxes"
 
-#: mail/mail-ops.c:1659
+#: mail/mail-ops.c:1713
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
 
-#: mail/mail-ops.c:1672
+#: mail/mail-ops.c:1726
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Recibindo a mensaxe %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1686
+#: mail/mail-ops.c:1740
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: mail/mail-ops.c:1760
+#: mail/mail-ops.c:1814
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1829
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1857
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-search-dialogue.c:107
+#: mail/mail-search-dialogue.c:113
 #, fuzzy
 msgid "_Search"
 msgstr "Buscar"
 
-#: mail/mail-send-recv.c:136
+#: mail/mail-send-recv.c:138
 #, fuzzy
 msgid "Cancelling ..."
 msgstr "Cancelar"
 
-#: mail/mail-send-recv.c:231
+#: mail/mail-send-recv.c:233
 #, fuzzy
 msgid "Send & Receive mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-send-recv.c:234
+#: mail/mail-send-recv.c:236
 #, fuzzy
 msgid "Receiving"
 msgstr "Data de recepci�n"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:285
 msgid "Updating ..."
 msgstr ""
 
-#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+#: 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:306
 #, fuzzy
 msgid "Sending"
 msgstr "Enviando \"%s\""
 
-#: mail/mail-send-recv.c:469
+#: mail/mail-send-recv.c:471
 #, fuzzy
 msgid "Cancelled."
 msgstr "Cancelar"
 
-#: mail/mail-send-recv.c:473
-#, fuzzy
-msgid "Complete."
-msgstr "% Comp_leta:"
-
-#: mail/mail-summary.c:111
+#: mail/mail-summary.c:109
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-tools.c:138
+#: mail/mail-tools.c:141
 #, 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:185
+#: mail/mail-tools.c:188
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (mensaxe reenviada)"
 
-#: mail/mail-tools.c:195
+#: mail/mail-tools.c:198
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (sen asunto)"
 
-#: mail/mail-tools.c:212
+#: mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-tools.c:214
+#: mail/mail-tools.c:217
 msgid "Forwarded message (no subject)"
 msgstr "Mensaxe reenviada (sen asunto)"
 
-#: mail/mail-tools.c:411
+#: 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-vfolder.c:248
+#: mail/mail-vfolder.c:249
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:427
 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:138 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
 msgid "Reply to the sender of this message"
 msgstr "Responder � autor desta mensaxe"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
 msgid "Reply to all recipients of this message"
 msgstr "Responder a t�dolos destinatarios desta mensaxe"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
 msgid "Forward this message"
 msgstr "Re-enviar esta mensaxe"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
+#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
 msgid "Print the selected message"
 msgstr "Imprimir a mensaxe seleccionada"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Borrar esta mensaxe"
 
-#: mail/message-list.c:618
+#: mail/message-list.c:648
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:621
+#: mail/message-list.c:649
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:624
+#: mail/message-list.c:650
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:627
+#: mail/message-list.c:651
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "Non foi posible enviar a mensaxe: %s"
 
-#: mail/message-list.c:630
+#: mail/message-list.c:652
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Editar Mensaxe"
 
-#: mail/message-list.c:952
-#, c-format
-msgid "[ %s ]"
-msgstr ""
+#: mail/message-list.c:656
+#, fuzzy
+msgid "Lowest"
+msgstr "Baixa"
 
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:964 mail/message-list.c:980
-#, c-format
-msgid "%s, et al."
-msgstr ""
+#: mail/message-list.c:657
+#, fuzzy
+msgid "Lower"
+msgstr "Baixa"
 
-#: mail/message-list.c:967 mail/message-list.c:983
+#: mail/message-list.c:661
 #, fuzzy
-msgid "<unknown>"
-msgstr "Desco�ecido"
+msgid "Higher"
+msgstr "Alta"
+
+#: mail/message-list.c:662
+#, fuzzy
+msgid "Highest"
+msgstr "Alta"
 
-#: mail/message-list.c:1035
+#: mail/message-list.c:912
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1042
+#: mail/message-list.c:919
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1051
+#: mail/message-list.c:928
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1063
+#: mail/message-list.c:940
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1071
+#: mail/message-list.c:948
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1073
+#: mail/message-list.c:950
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d de %Y"
 
-#: mail/message-list.c:1171
+#: mail/message-list.c:1052
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "From"
 msgstr "De:"
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "Date"
 msgstr "Pegar"
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "Received"
 msgstr "Data de recepci�n"
 
-#: mail/message-list.c:1173
+#: mail/message-list.c:1054
 #, fuzzy
 msgid "To"
 msgstr "A:"
 
-#: mail/message-list.c:1173
+#: mail/message-list.c:1054
 #, fuzzy
 msgid "Size"
 msgstr "Tama�o:"
 
-#: mail/openpgp-utils.c:89
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Introduza o seu contrasinal de PGP/GPG."
-
-#: mail/openpgp-utils.c:92
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Introduza o seu contrasinal de PGP/GPG."
-
-#: 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 "O programa GPG/PGP non est� dispo�ible."
-
-#: 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 "Non se indicou un contrasinal."
-
-#: 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"
-msgstr "Non foi posible crear unha canalizaci�n co GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:588
-msgid "No recipients specified"
-msgstr ""
-
-#: mail/openpgp-utils.c:1088
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Non foi posible crear unha canalizaci�n: %s"
-
-#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
 #, fuzzy
 msgid "Folder"
 msgstr "Carpetas"
 
-#: mail/subscribe-dialog.c:65
+#: mail/subscribe-dialog.c:77
 #, fuzzy
 msgid "Store"
 msgstr "Puntuaci�n"
 
-#: mail/subscribe-dialog.c:147
+#: mail/subscribe-dialog.c:138
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:177
+#: mail/subscribe-dialog.c:168
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:280
+#: mail/subscribe-dialog.c:271
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:273
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
+#. Construct the app
+#: mail/subscribe-dialog.c:873
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Descrici�n:"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #, fuzzy
 msgid "Folder name:"
@@ -6635,9 +7004,18 @@ msgstr "Carpetas"
 msgid "Specify where to create the folder:"
 msgstr "Non hai espacio dabondo para crear a carpeta"
 
+#: 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:157
+#: shell/importer/importer.c:182
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6645,76 +7023,72 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/importer/importer.c:175 shell/importer/importer.c:202
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/importer/importer.c:309
+#: shell/importer/importer.c:341
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr "Non hai novo correo en %s."
 
-#: shell/importer/importer.c:319
+#: shell/importer/importer.c:351
 #, fuzzy
 msgid "Importing"
 msgstr "Movendo"
 
-#: shell/importer/importer.c:327
+#: shell/importer/importer.c:359
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/importer/importer.c:342
+#: shell/importer/importer.c:372
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "Erro cargando o ficheiro: %s"
+
+#: shell/importer/importer.c:387
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: shell/importer/importer.c:357
+#: shell/importer/importer.c:402
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/importer/importer.c:428
+#: shell/importer/importer.c:473
 msgid "Automatic"
 msgstr ""
 
-#: shell/importer/importer.c:478
+#: shell/importer/importer.c:523
 #, fuzzy
 msgid "Filename:"
 msgstr "Nome de ficheiro:"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
 #, fuzzy
 msgid "Select a file"
 msgstr "Ficheiro de sinatura:"
 
-#: shell/importer/importer.c:493
+#: shell/importer/importer.c:538
 #, fuzzy
 msgid "File type:"
 msgstr "Nome de ficheiro:"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
 msgid "Import"
 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."
-msgstr ""
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -6736,11 +7110,11 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: shell/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr "Instalaci�n de Evolution"
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:122
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6748,30 +7122,30 @@ msgstr ""
 "Esta nova versi�n do Evolution necesita instalar ficheiros\n"
 "adicionais no seu directorio persoal do Evolution"
 
-#: shell/e-setup.c:117
+#: shell/e-setup.c:123
 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:157
+#: shell/e-setup.c:163
 msgid "Could not update files correctly"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
+#: 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:189
+#: shell/e-setup.c:195
 #, fuzzy
 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:190
+#: shell/e-setup.c:196
 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:209
+#: shell/e-setup.c:215
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6782,7 +7156,7 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:224
+#: shell/e-setup.c:230
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -6791,7 +7165,7 @@ msgstr ""
 "Non se poden copiar os ficheiros a\n"
 "`%s'."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:255
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6802,7 +7176,7 @@ msgstr ""
 "M�vao para poder instalar os ficheiros de\n"
 "usuario de Evolution."
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:267
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6813,7 +7187,7 @@ msgstr ""
 "directorio de Evolution. M�vao para poder\n"
 "instalar os ficheiros de usuario de Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:96
+#: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -6822,11 +7196,11 @@ msgstr ""
 "Non se pode crear a carpeta indicada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:153
+#: shell/e-shell-folder-creation-dialog.c:156
 msgid "The specified folder name is not valid."
 msgstr "O nome de carpeta indicado non � v�lido."
 
-#: shell/e-shell-folder-creation-dialog.c:245
+#: shell/e-shell-folder-creation-dialog.c:248
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear unha nova carpeta"
 
@@ -6838,28 +7212,28 @@ msgstr ""
 "O tipo da carpeta seleccionada non � v�lido para\n"
 "a operaci�n solicitada."
 
-#: shell/e-shell-folder-selection-dialog.c:318
+#: shell/e-shell-folder-selection-dialog.c:319
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
 msgid "(Untitled)"
 msgstr "(Sen_t�tulo)"
 
-#: shell/e-shell-view-menu.c:159
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy non foi atopado no seu $PATH."
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:179
 msgid "Bug buddy could not be run."
 msgstr "Non se puido executar Bug buddy."
 
-#: shell/e-shell-view-menu.c:194
+#: shell/e-shell-view-menu.c:208
 #, fuzzy
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:196
+#: shell/e-shell-view-menu.c:210
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6869,34 +7243,30 @@ msgstr ""
 "en grupo para xesti�n de correo, axenda e contactos\n"
 "dentro do ambiente de escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:360
+#: shell/e-shell-view-menu.c:374
 msgid "Go to folder..."
 msgstr "Ir � carpeta..."
 
-#: shell/e-shell-view.c:143
+#: shell/e-shell-view.c:148
 msgid "(No folder displayed)"
 msgstr "(Ningunha carpeta visualizada)"
 
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Carpetas"
-
-#: shell/e-shell-view.c:1124
+#: shell/e-shell-view.c:1134
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1126
+#: shell/e-shell-view.c:1136
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:372
+#: shell/e-shell.c:378
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Non se pode activar o almacenamento local -- %s"
 
-#: shell/e-shell.c:1242
+#: shell/e-shell.c:1248
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6905,15 +7275,15 @@ msgstr ""
 "Ooops!  A vista de `%s' morreu inesperadamente.  :-(\n"
 "Isto significa probablemente que o compo�ente %s se estragou."
 
-#: shell/e-shortcuts-view.c:123
+#: shell/e-shortcuts-view.c:134
 msgid "Create new shortcut group"
 msgstr "Crear novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:137
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:260
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -6922,75 +7292,75 @@ msgstr ""
 "�Realmente desexa eliminar o grupo\n"
 "`%s' da barra de atallos?"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:265
 msgid "Don't remove"
 msgstr "Non eliminar"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:276
 msgid "_Small Icons"
 msgstr "Iconas _Pequenas"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:277
 msgid "Show the shortcuts as small icons"
 msgstr "Amosar os atallos como iconas pequenas"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:279
 msgid "_Large Icons"
 msgstr "Iconas _Grandes"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:280
 msgid "Show the shortcuts as large icons"
 msgstr "Amosar os atallos como iconas grandes"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:291
 msgid "_New Group..."
 msgstr "_Novo Grupo..."
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:292
 msgid "Create a new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:294
 msgid "_Remove This Group..."
 msgstr "_Eliminar este Grupo..."
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:295
 msgid "Remove this shortcut group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:300
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Amosar a Barra de _Atallos"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:301
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Amosar a Barra de _Atallos"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate"
 msgstr "Activar"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate this shortcut"
 msgstr "Activar este atallo"
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:388
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
-#: shell/e-shortcuts.c:375
+#: shell/e-shortcuts.c:379
 msgid "Error saving shortcuts."
 msgstr "Erro gardando atallos."
 
-#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: 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:42
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
 msgid "_View"
 msgstr "_Vista"
 
-#: shell/e-storage-set-view.c:468
+#: shell/e-storage-set-view.c:649
 msgid "View the selected folder"
 msgstr "Ver carpeta seleccionada"
 
@@ -6998,47 +7368,47 @@ msgstr "Ver carpeta seleccionada"
 msgid "(No name)"
 msgstr "(Sen nome)"
 
-#: shell/e-storage.c:429
+#: shell/e-storage.c:459
 msgid "No error"
 msgstr "Sen erro"
 
-#: shell/e-storage.c:431
+#: shell/e-storage.c:461
 msgid "Generic error"
 msgstr "Erro xen�rico"
 
-#: shell/e-storage.c:433
+#: shell/e-storage.c:463
 msgid "A folder with the same name already exists"
 msgstr "Xa existe unha carpeta co mesmo nome"
 
-#: shell/e-storage.c:435
+#: shell/e-storage.c:465
 msgid "The specified folder type is not valid"
 msgstr "O tipo da carpeta especificada non � v�lido"
 
-#: shell/e-storage.c:437
+#: shell/e-storage.c:467
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:439
+#: shell/e-storage.c:469
 msgid "Not enough space to create the folder"
 msgstr "Non hai espacio dabondo para crear a carpeta"
 
-#: shell/e-storage.c:441
+#: shell/e-storage.c:471
 msgid "The specified folder was not found"
 msgstr "Non se atopou a carpeta especificada"
 
-#: shell/e-storage.c:443
+#: shell/e-storage.c:473
 msgid "Function not implemented in this storage"
 msgstr "Funci�n non implementada neste almacenamento"
 
-#: shell/e-storage.c:445
+#: shell/e-storage.c:475
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: shell/e-storage.c:447
+#: shell/e-storage.c:477
 msgid "Operation not supported"
 msgstr "Operaci�n non soportada"
 
-#: shell/e-storage.c:449
+#: shell/e-storage.c:479
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado non est� soportado neste almacenamento"
 
@@ -7047,7 +7417,7 @@ msgstr "O tipo especificado non est� soportado neste almacenamento"
 msgid "The Evolution shell."
 msgstr "Non se pode inicializar a shell de Evolution."
 
-#: shell/main.c:73
+#: shell/main.c:83
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -7068,7 +7438,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:98
+#: shell/main.c:108
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7076,15 +7446,19 @@ msgstr ""
 "Graci�as\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:129
+#: shell/main.c:139
 msgid "Cannot initialize the Evolution shell."
 msgstr "Non se pode inicializar a shell de Evolution."
 
-#: shell/main.c:175
-msgid "Disable."
-msgstr "Desactivar."
+#: shell/main.c:185
+msgid "Disable splash screen"
+msgstr ""
 
-#: shell/main.c:195
+#: shell/main.c:186
+msgid "Send the debugging output of all components to a file."
+msgstr ""
+
+#: shell/main.c:219
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Non se pode inicializar o sistema de compo�entes de Bonobo"
 
@@ -7110,8 +7484,7 @@ msgstr "Buscar un contacto"
 msgid "New contact"
 msgstr "Ver t�dolos contactos"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
 msgid "Previews the message to be printed"
 msgstr "Previsualiza a mensaxe que se vai imprimir"
 
@@ -7119,7 +7492,7 @@ msgstr "Previsualiza a mensaxe que se vai imprimir"
 msgid "Print contacts"
 msgstr "Imprimir contactos"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
 msgid "Stop"
 msgstr "Parar"
 
@@ -7145,7 +7518,7 @@ msgstr "Engadir Fonte"
 msgid "_Contact"
 msgstr "_Contactos..."
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
 #: ui/evolution-contact-editor.xml.h:15
 #, fuzzy
 msgid "_Print..."
@@ -7155,9 +7528,9 @@ msgstr "Imprimir..."
 msgid "_Search for contacts"
 msgstr "_Buscar contactos"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
+#: 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"
 msgstr "_Ferramentas"
 
@@ -7171,128 +7544,168 @@ msgid "Alter preferences"
 msgstr "Preferencias da Axenda"
 
 #: ui/evolution-calendar.xml.h:4
+#, fuzzy
+msgid "Create a new all day Event"
+msgstr "Crear unha nova axenda"
+
+#: ui/evolution-calendar.xml.h:5
 msgid "Create a new appointment"
 msgstr "Crear unha nova cita"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Create a new calendar"
 msgstr "Crear unha nova axenda"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Day"
 msgstr "D�a"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Go To"
 msgstr "Ir para"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Go back in time"
 msgstr "Ir para atr�s no tempo"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go forward in time"
 msgstr "Ir para diante no tempo"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
+#, fuzzy
+msgid "Go to _Date"
+msgstr "Ir � data"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Go to _Today"
+msgstr "Ir a hoxe"
+
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to a specific date"
 msgstr "Ir para a data especificada"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:14
 #, fuzzy
 msgid "Go to present time"
 msgstr "Ir � elemento seguinte"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
-msgid "New Appointment"
-msgstr "Nova cita..."
+msgid "New _Event"
+msgstr "Nova A_xenda"
 
-#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
 #: ui/evolution-task-editor-dialog.xml.h:32
 #, fuzzy
 msgid "Next"
 msgstr "Seguinte"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Open Calendar"
 msgstr "_Abrir axenda"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Prev"
 msgstr "Previsualizaci�n:"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Previews the calendar to be printed"
+msgstr "Previsualiza a mensaxe que se vai imprimir"
+
+#: ui/evolution-calendar.xml.h:25
 #, fuzzy
 msgid "Print calendar"
 msgstr "Imprimir axenda"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Print this Calendar"
 msgstr "Imprimir esta axenda"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
 #, fuzzy
 msgid "Save As"
 msgstr "Gardar _Como"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
 msgid "Save calendar as something else"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show 1 day"
 msgstr "Amosar un d�a"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show 1 month"
 msgstr "Amosar un mes"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show 1 week"
 msgstr "Amosar unha semana"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Amosar a semana laboral"
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
-#: widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
+#: widgets/misc/e-dateedit.c:422
 msgid "Today"
 msgstr "Hoxe"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "W_ork Week"
+msgstr "semana"
+
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Semana"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
 #, fuzzy
 msgid "_Appointment"
 msgstr "Citas:"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
+#: ui/evolution-calendar.xml.h:38
+#, fuzzy
+msgid "_Day"
+msgstr "D�a"
+
+#: ui/evolution-calendar.xml.h:39
+#, 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 "_Novo"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:41
 msgid "_Open Calendar"
 msgstr "_Abrir axenda"
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
 #: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
+#: ui/evolution-calendar.xml.h:45
+#, fuzzy
+msgid "_Week"
+msgstr "Semana"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Borrar este elemento"
@@ -7317,7 +7730,7 @@ 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:35 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Imprimir..."
 
@@ -7351,7 +7764,7 @@ msgstr "Enviar unha mensaxe sen asunto"
 
 #: 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:29
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
 msgid "_File"
 msgstr "_Ficheiro"
 
@@ -7408,7 +7821,7 @@ msgstr "Pechar esta cita"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "Copiar � Carpeta"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
+#: 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"
@@ -7504,7 +7917,7 @@ msgid "Print Setup"
 msgstr "Configuraci�n da Impresi�n"
 
 #: 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
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Gardar"
 
@@ -7527,7 +7940,8 @@ msgstr "FIXME: _Programar Reuni�n"
 msgid "Schedule some sort of a meeting"
 msgstr "FIXME: Programar Reuni�n"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:68
+#: ui/evolution-task-editor-dialog.xml.h:57
 #, fuzzy
 msgid "Select All"
 msgstr "Seleccionar _Todo"
@@ -7551,12 +7965,12 @@ msgid "_About..."
 msgstr "_Acerca de..."
 
 #: 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:26
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
 msgid "_Close"
 msgstr "_Pechar"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_Contact (FIXME)"
 msgstr "_Contacto (FIXME)"
 
@@ -7570,7 +7984,7 @@ msgid "_Debug"
 msgstr "_Depuraci�n"
 
 #: 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:33
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
 msgid "_Help"
 msgstr "A_xuda"
 
@@ -7613,7 +8027,7 @@ msgstr "_Pegar"
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Propiedades..."
@@ -7624,7 +8038,7 @@ msgid "_Select All"
 msgstr "Seleccionar _Todo"
 
 #: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:41
 msgid "_Task (FIXME)"
 msgstr "_Tarefa (FIXME)"
 
@@ -7657,262 +8071,401 @@ msgid "New Mail"
 msgstr "Recibir Correo"
 
 #: ui/evolution-mail.xml.h:2
+msgid "Apply any new filters to the mail in this box"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:3
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:4
 msgid "Compose"
 msgstr "Redactar"
 
-#: ui/evolution-mail.xml.h:3
+#: ui/evolution-mail.xml.h:5
 msgid "Compose a new message"
 msgstr "Redactar unha nova mensaxe"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Configure Folder..."
+msgstr "Mover para a Carpeta"
+
+#: ui/evolution-mail.xml.h:8
 msgid "Copy message to a new folder"
 msgstr "Copiar a mensaxe nunha nova carpeta"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail.xml.h:9
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Copiar a mensaxe nunha nova carpeta"
+
+#: ui/evolution-mail.xml.h:10
 #, fuzzy
 msgid "Create _Virtual Folder From Message"
 msgstr "Carpetas Virtuais"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Delete the selected messages"
+msgstr "Imprimir a mensaxe seleccionada"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Display all of the message headers"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail.xml.h:15
 #, fuzzy
-msgid "Empty Trash"
+msgid "Edit Message"
+msgstr "_Editar Mensaxe"
+
+#: ui/evolution-mail.xml.h:16
+#, fuzzy
+msgid "Edit the current message"
+msgstr "a hora actual"
+
+#: ui/evolution-mail.xml.h:17
+#, fuzzy
+msgid "Empty _Trash"
 msgstr "D�as baleiros:"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:18
+msgid "Expunge"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:19
 #, fuzzy
 msgid "Filter on Se_nder"
 msgstr "Responder � Autor"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:20
 #, fuzzy
 msgid "Filter on _Recipients"
 msgstr "Destinatarios"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:21
 #, fuzzy
 msgid "Filter on _Subject"
 msgstr "Asunto"
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:22
+msgid "Finaly remove all mails tagged for deletion"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:23
 msgid "Forget _Passwords"
 msgstr "Esquecer _Contrasinais"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:25
 #, fuzzy
 msgid "Forward As"
 msgstr "Re-enviar"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:27
+msgid "Forward the selected mail to someone"
+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.xml.h:30
 #, fuzzy
-msgid "Full Headers"
+msgid "Full _Headers"
 msgstr "Nome Completo:"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:31
+#, fuzzy
+msgid "Hide Deleted Messages"
+msgstr "Borrar Mensaxe"
+
+#: ui/evolution-mail.xml.h:32
 #, fuzzy
 msgid "Hide S_elected Messages"
 msgstr "Imprimir a mensaxe seleccionada"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:33
 #, fuzzy
 msgid "Hide _Deleted Messages"
 msgstr "Borrar Mensaxe"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:34
 #, fuzzy
 msgid "Hide _Read messages"
 msgstr "Mensaxe reenviada - %s"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Inline"
-msgstr ""
+#: ui/evolution-mail.xml.h:35
+#, fuzzy
+msgid "Invert Selection"
+msgstr "_Inverter Selecci�n"
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:36
 #, fuzzy
 msgid "Manage _Subscriptions..."
 msgstr "Descrici�n:"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:37
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:38
 #, fuzzy
 msgid "Mark All as R_ead"
 msgstr "Marcar como _Lida"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:39
+#, fuzzy
+msgid "Mark As Read"
+msgstr "Marcar como _Lida"
+
+#: ui/evolution-mail.xml.h:40
+#, fuzzy
+msgid "Mark As U_nread"
+msgstr "Marcar como _non Lida"
+
+#: ui/evolution-mail.xml.h:41
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Marcar como _non Lida"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:42
 #, fuzzy
-msgid "Message _Display"
-msgstr "Corpo da Mensaxe"
+msgid "Mark the selected messages as having been read"
+msgstr "Imprimir a mensaxe seleccionada"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:43
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:44
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:45
 msgid "Move message to a new folder"
 msgstr "Mover mensaxe a unha nova carpeta"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:46
+#, fuzzy
+msgid "Move selected messages to another folder"
+msgstr "Mover mensaxe a unha nova carpeta"
+
+#: ui/evolution-mail.xml.h:47
+msgid "Open in New Window"
+msgstr "Abrir nunha Nova Fiestra"
+
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Open the current message in a new window"
+msgstr "Enviar mensaxes en formato HTML"
+
+#: ui/evolution-mail.xml.h:53
+msgid "Print Preview of message..."
+msgstr "Previsualizaci�n da Impresi�n da mensaxe..."
+
+#: ui/evolution-mail.xml.h:54
 msgid "Print message to the printer"
 msgstr "Imprimir mensaxe na impresora"
 
-#: ui/evolution-mail.xml.h:36
-#, fuzzy
-msgid "Quoted"
-msgstr "No_tas:"
+#: ui/evolution-mail.xml.h:55
+msgid "Print message..."
+msgstr "Imprimir mensaxe..."
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:58
 msgid "Redirect (FIXME: implement me)"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:61
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:62
+#, fuzzy
+msgid "Reply to all"
+msgstr "Responder a Todos"
+
+#: ui/evolution-mail.xml.h:64
+#, fuzzy
+msgid "Reply to sender"
+msgstr "Responder � Autor"
+
+#: ui/evolution-mail.xml.h:66
 #, fuzzy
 msgid "S_ource"
 msgstr "Fontes"
 
-#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "Save the message into a new file"
+msgstr "Mover mensaxe a unha nova carpeta"
+
+#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Seleccionar _Todo"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:70
 #, fuzzy
 msgid "Select _Thread"
 msgstr "Seleccionar _Todo"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Send and Receive"
+#: ui/evolution-mail.xml.h:71
+#, fuzzy
+msgid "Send / Receive"
+msgstr "Enviando Correo"
+
+#: ui/evolution-mail.xml.h:72
+msgid "Send a reply to the person who sent you this mail"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:73
+msgid "Send a single mail in reply to all the selected mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:74
+#, fuzzy
+msgid ""
+"Send queued mail\n"
+"    and retrieve new mail"
+msgstr "Enviar o correo na cola e recibir o correo novo"
+
+#: ui/evolution-mail.xml.h:76
 msgid "Send queued mail and retrieve new mail"
 msgstr "Enviar o correo na cola e recibir o correo novo"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:77
 #, fuzzy
 msgid "Show _All"
 msgstr "Ver Todos"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:79
 #, fuzzy
 msgid "Threaded Message list"
 msgstr "Mensaxe reenviada - %s"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:80
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "Imprimir a mensaxe seleccionada"
+
+#: ui/evolution-mail.xml.h:82
 #, fuzzy
 msgid "VFolder on Se_nder"
 msgstr "Responder � Autor"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:83
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "Destinatarios"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:84
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Asunto"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:85
 msgid "View Raw Message Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:86
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "Carpetas Virtuais"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Actions"
-msgstr "_Acci�ns"
-
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:87
 msgid "_Apply Filters"
 msgstr "_Aplicar Filtros"
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:88
 #, fuzzy
-msgid "_Compose"
-msgstr "Redactar"
+msgid "_Attachment"
+msgstr "anexo"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:89
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Copiar � Carpeta"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:90
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:92
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:93
 #, fuzzy
 msgid "_Filters..."
 msgstr "_Filtros de Correo..."
 
-#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:95
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:96
+#, fuzzy
+msgid "_Inline"
+msgstr "�_ndice"
+
+#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Inverter Selecci�n"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:98
 #, fuzzy
 msgid "_Mail Message"
 msgstr "FIXME: Enviar _Mensaxe"
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:99
 #, fuzzy
 msgid "_Mail Settings..."
 msgstr "_Configuraci�n"
 
-#: ui/evolution-mail.xml.h:69
-#, fuzzy
-msgid "_Message Hiding"
-msgstr "_Mensaxe"
-
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail.xml.h:100
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "_Mover para a Carpeta"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail.xml.h:101
 #, fuzzy
 msgid "_Open Selected Items"
 msgstr "Abrir a tarefa"
 
-#: ui/evolution-mail.xml.h:74
-msgid "_Send and Receive"
-msgstr ""
+#: ui/evolution-mail.xml.h:103
+#, fuzzy
+msgid "_Quoted"
+msgstr "No_tas:"
+
+#: ui/evolution-mail.xml.h:104
+#, fuzzy
+msgid "_Reply"
+msgstr "Responder"
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail.xml.h:105
+#, fuzzy
+msgid "_Resend Messages"
+msgstr "_Editar Mensaxe"
+
+#: ui/evolution-mail.xml.h:107
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Gardar como..."
+
+#: ui/evolution-mail.xml.h:108
+#, fuzzy
+msgid "_Send / Receive"
+msgstr "Enviando Correo"
+
+#: ui/evolution-mail.xml.h:109
 msgid "_Threaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:111
 #, fuzzy
 msgid "_Undelete"
 msgstr "_Borrar"
@@ -8186,7 +8739,7 @@ msgstr "Desfacer"
 msgid "Undo the last action"
 msgstr "Desfacer a �ltima acci�n"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
 msgid "_Appointment (FIXME)"
 msgstr "_Cita (FIXME)"
 
@@ -8324,123 +8877,135 @@ msgstr "Movendo"
 msgid "_About Evolution..."
 msgstr "_Acerca do Evolution..."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:25
+msgid "_Actions"
+msgstr "_Acci�ns"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Carpeta"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:33
 msgid "_Go to Folder..."
 msgstr "_Ir para a Carpeta..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Import file..."
 msgstr "_Propiedades..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:36
 msgid "_Index"
 msgstr "�_ndice"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:37
 #, fuzzy
 msgid "_Mail message"
 msgstr "_Mensaxe"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_New Folder"
 msgstr "Nova VFolder"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Amosar a Barra de _Atallos"
 
 #. 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:2475
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+msgid "Tentative"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Ocupado"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "F�ra da Oficina"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Sen Informaci�n"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
 msgid "_Invite Others..."
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
 msgid "_Options"
 msgstr "_Opci�ns"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
 msgid "Show _Only Working Hours"
 msgstr "Amosar _S� as Horas de Traballo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
 msgid "_All People and Resources"
 msgstr "_T�dalas Persoas e Recursos"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
 msgid "All _People and One Resource"
 msgstr "T�dalas _Persoas e Un Recurso"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
 msgid "_Required People"
 msgstr "Persoas _Requiridas"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
 msgid "Required People and _One Resource"
 msgstr "Persoas Requiridas e _Un Recurso"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
 msgid "Meeting _start time:"
 msgstr "Hora do _inicio da reuni�n:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
 msgid "Meeting _end time:"
 msgstr "Hora do _final da reuni�n:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
 msgid "All Attendees"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:171
+#: widgets/menus/gal-view-menus.c:177
 #, fuzzy
 msgid "_Current View"
 msgstr "a hora actual"
 
+#: widgets/menus/gal-view-menus.c:196
+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
@@ -8452,97 +9017,112 @@ msgstr "LMMXVSD"
 msgid "%B %Y"
 msgstr "%B de %Y"
 
-#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
 msgid "Now"
 msgstr "Agora"
 
-#: widgets/misc/e-cell-date-edit.c:239
+#: widgets/misc/e-cell-date-edit.c:242
 msgid "OK"
 msgstr ""
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#.
-#: widgets/misc/e-cell-date-edit.c:460
-#, fuzzy
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S%n"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
-#: 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"
-
-#. strftime format of a time in 12-hour format.
-#.
-#: widgets/misc/e-cell-date-edit.c:469
-#, fuzzy
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p%n"
-
-#. FIXME: Better message needed.
-#: widgets/misc/e-cell-date-edit.c:736
-msgid "The time is invalid"
+#: widgets/misc/e-cell-date-edit.c:723
+#, fuzzy, c-format
+msgid "The time must be in the format: %s"
 msgstr ""
+"A data ten que ser introducida no formato: \n"
+"\n"
+"%s"
 
 #: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:160
+#: widgets/misc/e-filter-bar.c:166
 #, fuzzy
 msgid "Save Search"
 msgstr "Buscar"
 
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:311
+#: widgets/misc/e-filter-bar.c:317
 msgid "Advanced ..."
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:141
+#: widgets/misc/e-messagebox.c:152
 #, fuzzy
 msgid "Information"
 msgstr "Sen Informaci�n"
 
-#: widgets/misc/e-messagebox.c:148
+#: widgets/misc/e-messagebox.c:159
 #, fuzzy
 msgid "Warning"
 msgstr "Movendo"
 
-#: widgets/misc/e-messagebox.c:162
+#: widgets/misc/e-messagebox.c:173
 #, fuzzy
 msgid "Question"
 msgstr "Descrici�n:"
 
-#: widgets/misc/e-messagebox.c:169
+#: widgets/misc/e-messagebox.c:180
 #, fuzzy
 msgid "Message"
 msgstr "_Mensaxe"
 
 #. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
+#: widgets/misc/e-messagebox.c:224
 #, fuzzy
 msgid "Don't show this message again."
 msgstr "Borrar esta mensaxe"
 
-#: widgets/misc/e-search-bar.c:140
+#: widgets/misc/e-search-bar.c:148
 #, fuzzy
 msgid "Sear_ch"
 msgstr "Buscar"
 
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Adress Cards"
+msgstr "Enderezo"
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "Compa��a"
+
+#: views/addressbook/galview.xml.h:3
+#, fuzzy
+msgid "Phone List"
+msgstr "Tipos de Tel�fono"
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "Autor"
+
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "_Estado:"
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "Asunto"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "_Mensaxe"
+
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With Category"
+msgstr ""
+"\n"
+"Categor�as: "
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
 msgid "The Personal Addressbook Server"
@@ -8552,28 +9132,179 @@ msgstr "Engadir Fonte"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:153
+#: wombat/wombat.c:173
 #, fuzzy
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: wombat/wombat.c:165
+#: wombat/wombat.c:185
 #, fuzzy
 msgid "init_corba(): could not initialize GNOME"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: wombat/wombat.c:178
+#: wombat/wombat.c:198
 #, fuzzy
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
 #, fuzzy
-#~ msgid "Copyright (C) 2000, Helix Code, Inc."
-#~ msgstr "Copyright 1999, 2000 Helix Code, Inc."
+#~ msgid "Click here to add a contact"
+#~ msgstr "<prema aqu� para seleccionar unha data>"
+
+#, fuzzy
+#~ msgid ""
+#~ "This option will connect to the server using a the PLAIN SASL mechanism if "
+#~ "the server supports it."
+#~ msgstr ""
+#~ "Esta opci�n conectarase � servidor IMAP usando un contrasinal sen cifrar."
+
+#~ msgid "URL string `%s' contains no protocol"
+#~ msgstr "O URL `%s' non cont�n ning�n protocolo"
+
+#~ msgid "URL string `%s' contains an invalid protocol"
+#~ msgstr "O URL `%s' cont�n un protocolo non v�lido"
+
+#~ msgid "Port number in URL `%s' is non-numeric"
+#~ msgstr "O n�mero de porto no URL `%s' non � num�rico"
+
+#, fuzzy
+#~ msgid "Secure IMAPv4"
+#~ msgstr "IMAPv4"
+
+#, fuzzy
+#~ 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 ""
+#~ "Para conectarse a servidores POP. O protocolo POP tam�n se pode usar para "
+#~ "recibir correo de certos provedores de correo web, e de sistemas de email "
+#~ "propietarios."
+
+#, fuzzy
+#~ msgid "No authentication required"
+#~ msgstr "Autenticaci�n"
+
+#, fuzzy
+#~ 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 opci�n conectarase � servidor POP usando un contrasinal sen cifrar. "
+#~ "Esta � a �nica opci�n que soportan moitos servidores POP."
+
+#~ msgid "Remove action"
+#~ msgstr "Eliminar acci�n"
+
+#~ msgid "Remove criterion"
+#~ msgstr "Eliminar criterio"
+
+#, fuzzy
+#~ msgid "Check settings"
+#~ msgstr "Probar Configuraci�n"
+
+#~ msgid "Email address:"
+#~ msgstr "Enderezo de email:"
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Configuraci�n de Correo do Evolution"
+
+#, fuzzy
+#~ msgid "Hostname:"
+#~ msgstr "Nome de usuario:"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#, fuzzy
+#~ msgid "Keep mail on server"
+#~ msgstr "Non borrar as mensaxes do servidor"
+
+#, fuzzy
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos 4"
+
+#~ msgid "Mail"
+#~ msgstr "Correo"
+
+#, fuzzy
+#~ msgid "Mail Account"
+#~ msgstr "Contas"
+
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Axudante da Configuraci�n do Correo"
+
+#~ msgid "Optional"
+#~ msgstr "Opcional"
+
+#~ msgid "Password:"
+#~ msgstr "Contrasinal:"
+
+#, fuzzy
+#~ msgid "Remember my password"
+#~ msgstr "Gardar como VCard"
+
+#, fuzzy
+#~ msgid "Reply address:"
+#~ msgstr "Enderezo de email:"
+
+#, fuzzy
+#~ msgid "Required"
+#~ msgstr "Persoas _Requiridas"
+
+#, fuzzy
+#~ msgid "Save password"
+#~ msgstr "Gardar como VCard"
+
+#, fuzzy
+#~ msgid "Select signature file"
+#~ msgstr "Ficheiro de sinatura:"
+
+#, fuzzy
+#~ msgid "Server type:"
+#~ msgstr "Tipo de Servidor: "
+
+#, fuzzy
+#~ msgid "Signature:"
+#~ msgstr "Ficheiro de sinatura:"
 
 #, fuzzy
-#~ msgid "Connect to server"
-#~ msgstr "Non foi posible conectarse � servidor POP en %s."
+#~ msgid "Transport"
+#~ msgstr "Transparente"
+
+#, fuzzy
+#~ msgid "Transport Authentication"
+#~ msgstr "Autenticaci�n"
+
+#, fuzzy
+#~ msgid "minutes."
+#~ msgstr "minutos"
+
+#~ msgid "%s message %d of %d (uid \"%s\")"
+#~ msgstr "%s mensaxe %d de %d (uid \"%s\")"
+
+#, fuzzy
+#~ msgid "<unknown>"
+#~ msgstr "Desco�ecido"
+
+#~ msgid "No GPG/PGP program available."
+#~ msgstr "O programa GPG/PGP non est� dispo�ible."
+
+#, fuzzy
+#~ msgid "Message _Display"
+#~ msgstr "Corpo da Mensaxe"
+
+#, fuzzy
+#~ msgid "_Compose"
+#~ msgstr "Redactar"
+
+#, fuzzy
+#~ msgid "_Message Hiding"
+#~ msgstr "_Mensaxe"
+
+#, fuzzy
+#~ msgid "Copyright (C) 2000, Helix Code, Inc."
+#~ msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
 #~ msgid "New"
 #~ msgstr "Novo"
@@ -8743,14 +9474,6 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgid "Registering local folder"
 #~ msgstr "Creando unha nova carpeta"
 
-#, fuzzy
-#~ msgid ""
-#~ "Unable to register folder '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Non foi posible crear a carpeta `%s':\n"
-#~ "%s"
-
 #~ msgid "Fetching email from %s"
 #~ msgstr "Recibindo correo de %s"
 
@@ -8792,9 +9515,6 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgid "Retrieving message %d of %d"
 #~ msgstr "Recibindo a mensaxe %d de %d"
 
-#~ msgid "Writing message %d of %d"
-#~ msgstr "Escribindo a mensaxe %d de %d"
-
 #~ msgid "Saving changes to %s"
 #~ msgstr "Gardando as modificaci�ns de %s"
 
@@ -8806,10 +9526,6 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ "%s"
 
 #, fuzzy
-#~ msgid "Unsubscribe from folder \"%s\""
-#~ msgstr "Abrindo as mensaxes da carpeta \"%s\""
-
-#, fuzzy
 #~ msgid "FIXME: _Appointment"
 #~ msgstr "FIXME: _Nova Cita"
 
@@ -9049,12 +9765,6 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgid "Server:"
 #~ msgstr "Servidor:"
 
-#~ msgid "Detect supported types..."
-#~ msgstr "Detectar tipos soportados..."
-
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Non borrar as mensaxes do servidor"
-
 #~ msgid "Mail source type:"
 #~ msgstr "Tipo de fonte de correo:"
 
@@ -9079,9 +9789,6 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgid "Edit News Server"
 #~ msgstr "Editar Servidor de News"
 
-#~ msgid "Testing \"%s\""
-#~ msgstr "Probando \"%s\""
-
 #~ msgid "The connection was successful!"
 #~ msgstr "�A conexi�n foi correcta!"
 
@@ -9147,12 +9854,6 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgid "_Undo"
 #~ msgstr "_Desfacer"
 
-#~ msgid "Print Preview of message..."
-#~ msgstr "Previsualizaci�n da Impresi�n da mensaxe..."
-
-#~ msgid "Print message..."
-#~ msgstr "Imprimir mensaxe..."
-
 #~ msgid "Reply to _Sender"
 #~ msgstr "Responder � _Autor"
 
@@ -9160,9 +9861,6 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgid "Show _All messages"
 #~ msgstr "Ver Todos"
 
-#~ msgid "_Edit Message"
-#~ msgstr "_Editar Mensaxe"
-
 #~ msgid "_Mail Configuration..."
 #~ msgstr "Configuraci�n do _Correo..."
 
@@ -9173,19 +9871,12 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgstr "_Imprimir Mensaxe"
 
 #, fuzzy
-#~ msgid "_Save Message As..."
-#~ msgstr "Gardar como..."
-
-#, fuzzy
 #~ msgid "_Source"
 #~ msgstr "Fontes"
 
 #~ msgid "Show the _Folder Bar"
 #~ msgstr "Amosar a Barra de _Carpetas"
 
-#~ msgid "Available Categories:"
-#~ msgstr "Categor�as Dispo�ibles:"
-
 #~ msgid "External Directories"
 #~ msgstr "Directorios Externos"
 
@@ -9302,15 +9993,9 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgid "Send a message without a subject"
 #~ msgstr "Enviar unha mensaxe sen asunto"
 
-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "Marcando mensaxes na carpeta \"%s\""
-
 #~ msgid "Mark messages in folder \"%s\""
 #~ msgstr "Marcar mensaxes na carpeta \"%s\""
 
-#~ msgid "Marking message %d of %d"
-#~ msgstr "Marcando a mensaxe %d de %d"
-
 #~ msgid "Forwarding a message without a subject"
 #~ msgstr "Reenviando unha mensaxe sen asunto"
 
@@ -9379,15 +10064,9 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgid "Could not rename folder `%s': %s exists"
 #~ msgstr "Non foi posible renomear a carpeta `%s': %s existe"
 
-#~ msgid "Open in New Window"
-#~ msgstr "Abrir nunha Nova Fiestra"
-
 #~ msgid "Forward Message"
 #~ msgstr "Reenviar esta mensaxe"
 
-#~ msgid "Move Message"
-#~ msgstr "Mover Mensaxe"
-
 #~ msgid "Copy Message"
 #~ msgstr "Copiar Mensaxe"
 
@@ -9409,9 +10088,6 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgid "Don't know protocol to open URI `%s'"
 #~ msgstr "O protocolo para abrir o URI `%s' � desco�ecido"
 
-#~ msgid "New Ca_lendar"
-#~ msgstr "Nova A_xenda"
-
 #~ msgid "_New appointment..."
 #~ msgstr "_Nova cita..."
 
diff --git a/po/hu.po b/po/hu.po
index 0982a7160c..3d5d31122d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2001-03-15 11:18+0100\n"
+"POT-Creation-Date: 2001-04-14 08:51-0400\n"
 "PO-Revision-Date: 2001-01-24 15:15+0100\n"
 "Last-Translator: Szabolcs BAN <shooby@gnome.hu>\n"
 "Language-Team: Hungarian <hu@gnome.hu>\n"
@@ -12,11 +12,11 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3209
 msgid "Card: "
 msgstr "K�rtya:"
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3211
 msgid ""
 "\n"
 "Name: "
@@ -24,7 +24,7 @@ msgstr ""
 "\n"
 "N�v:  "
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3212
 msgid ""
 "\n"
 "  Prefix:     "
@@ -32,7 +32,7 @@ msgstr ""
 "\n"
 " El�tag:      "
 
-#: addressbook/backend/ebook/e-card.c:3057
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "  Given:      "
@@ -40,7 +40,7 @@ msgstr ""
 "\n"
 "  Adott:      "
 
-#: addressbook/backend/ebook/e-card.c:3058
+#: addressbook/backend/ebook/e-card.c:3214
 msgid ""
 "\n"
 "  Additional: "
@@ -48,7 +48,7 @@ msgstr ""
 "\n"
 "  Egy�b:      "
 
-#: addressbook/backend/ebook/e-card.c:3059
+#: addressbook/backend/ebook/e-card.c:3215
 msgid ""
 "\n"
 "  Family:     "
@@ -56,7 +56,7 @@ msgstr ""
 "\n"
 "  Csal�di:    "
 
-#: addressbook/backend/ebook/e-card.c:3060
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "  Suffix:     "
@@ -64,7 +64,7 @@ msgstr ""
 "\n"
 "  Ut�tag:     "
 
-#: addressbook/backend/ebook/e-card.c:3074
+#: addressbook/backend/ebook/e-card.c:3230
 msgid ""
 "\n"
 "Birth Date: "
@@ -72,7 +72,7 @@ msgstr ""
 "\n"
 "Sz�let�si d�tum: "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3241
 msgid ""
 "\n"
 "Address:"
@@ -80,7 +80,7 @@ msgstr ""
 "\n"
 "C�m:"
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3243
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -88,7 +88,7 @@ msgstr ""
 "\n"
 "  Postafi�k:   "
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3244
 msgid ""
 "\n"
 "  Ext:         "
@@ -96,7 +96,7 @@ msgstr ""
 "\n"
 " K�l:"
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3245
 msgid ""
 "\n"
 "  Street:      "
@@ -104,7 +104,7 @@ msgstr ""
 "\n"
 "  �t:          "
 
-#: addressbook/backend/ebook/e-card.c:3090
+#: addressbook/backend/ebook/e-card.c:3246
 msgid ""
 "\n"
 "  City:        "
@@ -112,7 +112,7 @@ msgstr ""
 "\n"
 "  V�ros:       "
 
-#: addressbook/backend/ebook/e-card.c:3091
+#: addressbook/backend/ebook/e-card.c:3247
 msgid ""
 "\n"
 "  Region:      "
@@ -120,7 +120,7 @@ msgstr ""
 "\n"
 "  R�gi�:       "
 
-#: addressbook/backend/ebook/e-card.c:3092
+#: addressbook/backend/ebook/e-card.c:3248
 msgid ""
 "\n"
 "  Postal Code: "
@@ -128,7 +128,7 @@ msgstr ""
 "\n"
 " Ir�ny�t�sz�m: "
 
-#: addressbook/backend/ebook/e-card.c:3093
+#: addressbook/backend/ebook/e-card.c:3249
 msgid ""
 "\n"
 "  Country:     "
@@ -136,13 +136,13 @@ msgstr ""
 "\n"
 "  Orsz�g:      "
 
-#: addressbook/backend/ebook/e-card.c:3106
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3118
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "Telephones:\n"
@@ -150,7 +150,7 @@ msgstr ""
 "\n"
 "Telefonok:\n"
 
-#: addressbook/backend/ebook/e-card.c:3121
+#: addressbook/backend/ebook/e-card.c:3277
 msgid ""
 "\n"
 "Telephone:"
@@ -158,7 +158,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3145
+#: addressbook/backend/ebook/e-card.c:3301
 msgid ""
 "\n"
 "E-mail:\n"
@@ -166,7 +166,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3148
+#: addressbook/backend/ebook/e-card.c:3304
 msgid ""
 "\n"
 "E-mail:"
@@ -174,7 +174,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3167
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Mailer: "
@@ -182,7 +182,7 @@ msgstr ""
 "\n"
 "Levelez�: "
 
-#: addressbook/backend/ebook/e-card.c:3173
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "Time Zone: "
@@ -190,7 +190,7 @@ msgstr ""
 "\n"
 "Id�z�na: "
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Geo Location: "
@@ -198,7 +198,7 @@ msgstr ""
 "\n"
 "Hely: "
 
-#: addressbook/backend/ebook/e-card.c:3185
+#: addressbook/backend/ebook/e-card.c:3341
 msgid ""
 "\n"
 "Business Role: "
@@ -206,7 +206,7 @@ msgstr ""
 "\n"
 "�zleti szab�ly:"
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "Org: "
@@ -214,7 +214,7 @@ msgstr ""
 "\n"
 "C�g:"
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Name:  "
@@ -222,7 +222,7 @@ msgstr ""
 "\n"
 " N�v:"
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3355
 msgid ""
 "\n"
 "  Unit:  "
@@ -230,7 +230,7 @@ msgstr ""
 "\n"
 " Egys�g:"
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "  Unit2: "
@@ -238,7 +238,7 @@ msgstr ""
 "\n"
 " 2. egys�g:"
 
-#: addressbook/backend/ebook/e-card.c:3201
+#: addressbook/backend/ebook/e-card.c:3357
 msgid ""
 "\n"
 "  Unit3: "
@@ -246,7 +246,7 @@ msgstr ""
 "\n"
 " 3. egys�g:"
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Unit4: "
@@ -254,7 +254,7 @@ msgstr ""
 "\n"
 " 4. egys�g:"
 
-#: addressbook/backend/ebook/e-card.c:3206
+#: addressbook/backend/ebook/e-card.c:3362
 msgid ""
 "\n"
 "Categories: "
@@ -262,7 +262,7 @@ msgstr ""
 "\n"
 "Kateg�ri�k:"
 
-#: addressbook/backend/ebook/e-card.c:3207
+#: addressbook/backend/ebook/e-card.c:3363
 msgid ""
 "\n"
 "Comment: "
@@ -280,7 +280,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3220
+#: addressbook/backend/ebook/e-card.c:3376
 msgid ""
 "\n"
 "Unique String: "
@@ -288,7 +288,7 @@ msgstr ""
 "\n"
 "Egyedi sz�veg:"
 
-#: addressbook/backend/ebook/e-card.c:3223
+#: addressbook/backend/ebook/e-card.c:3379
 msgid ""
 "\n"
 "Public Key: "
@@ -304,15 +304,15 @@ msgstr ""
 msgid "Imports GnomeCard files into Evolution."
 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
+#: 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:68 calendar/gui/main.c:54
+#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
 msgid "Could not initialize Bonobo"
 msgstr "A Bonobo inicializ�l�sa nem siker�lt"
 
@@ -324,20 +324,20 @@ msgstr "A kurzort nem tudom bet�lteni\n"
 msgid "EBook not loaded\n"
 msgstr "Az EBook nincs bet�ltve\n"
 
-#: addressbook/conduit/address-conduit.c:651
+#: addressbook/conduit/address-conduit.c:654
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Nem tudom elind�tani a wombat kiszolg�l�t"
 
-#: addressbook/conduit/address-conduit.c:652
+#: addressbook/conduit/address-conduit.c:655
 #: calendar/conduits/calendar/calendar-conduit.c:732
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Nem tudom a wombat-ot elind�tani"
 
-#: 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 "Nem tudom a pilot Address application blokkj�t olvasni"
 
@@ -345,7 +345,7 @@ msgstr "Nem tudom a pilot Address application blokkj�t olvasni"
 #: 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:4
+#: mail/mail-config.glade.h:7
 msgid "Add"
 msgstr "Hozz�ad"
 
@@ -386,7 +386,6 @@ msgstr "F�jl mint:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:10
 #: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:27
 msgid "General"
 msgstr "Alap"
 
@@ -403,7 +402,7 @@ msgid "Phone Types"
 msgstr "Telefon t�pusok"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "Primary Email"
 msgstr "Els�dleges email"
 
@@ -416,7 +415,7 @@ msgid "Web page address:"
 msgstr "Weblap c�m:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:74
 msgid "_Add"
 msgstr "Hozz�_ad"
 
@@ -441,8 +440,8 @@ msgid "_Company:"
 msgstr "_V�llalat:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
+#: 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"
 msgstr "_T�r�l"
 
@@ -494,129 +493,125 @@ msgstr "Ez a _levelez�si c�m"
 msgid "Delete Contact?"
 msgstr "N�vjegy t�rl�se?"
 
-#: addressbook/contact-editor/e-contact-editor.c:590
+#: addressbook/contact-editor/e-contact-editor.c:603
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "Az elemek az al�bbi kateg�ri�khoz tartoznak:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/widgets/e-addressbook-view.c:676
 msgid "Assistant"
 msgstr "Asszisztens"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1297
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1310
 msgid "Business"
 msgstr "�zleti"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/contact-editor/e-contact-editor.c:1244
 msgid "Business 2"
 msgstr "2. �zleti"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Business Fax"
 msgstr "�zleti fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Callback"
 msgstr "Visszah�v�s"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "Car"
 msgstr "Aut�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1248
 msgid "Company"
 msgstr "V�llalat"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
-#: addressbook/contact-editor/e-contact-editor.c:1298
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1311
 msgid "Home"
 msgstr "Otthoni"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/contact-editor/e-contact-editor.c:1250
 msgid "Home 2"
 msgstr "2. Otthoni"
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Home Fax"
 msgstr "Otthoni fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/contact-editor/e-contact-editor.c:1253
 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:591
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
+#: 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"
 msgstr "M�s"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:662
 msgid "Other Fax"
 msgstr "Egy�b fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Pager"
 msgstr "Szem�lyh�v�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1257
 msgid "Primary"
 msgstr "Els�dleges"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/gui/widgets/e-addressbook-view.c:664
 msgid "Radio"
 msgstr "R�di�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/widgets/e-addressbook-view.c:665
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:1260
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
-#: addressbook/gui/widgets/e-addressbook-view.c:593
+#: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:668
 msgid "Email 2"
 msgstr "2. email"
 
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/gui/widgets/e-addressbook-view.c:594
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/gui/widgets/e-addressbook-view.c:669
 msgid "Email 3"
 msgstr "3. email"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:214
+#: addressbook/contact-editor/e-contact-quick-add.c:223
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:216
+#: addressbook/contact-editor/e-contact-quick-add.c:225
 #, fuzzy
 msgid "Edit Full"
 msgstr "Sz�r�k szerkeszt�se"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:253
+#: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/widgets/e-addressbook-view.c:643
 #, fuzzy
 msgid "Full Name"
 msgstr "Teljes n�v:"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:259
+#: addressbook/contact-editor/e-contact-quick-add.c:268
 #, fuzzy
 msgid "E-mail"
 msgstr "2. email"
@@ -735,25 +730,25 @@ msgstr "_El�tag:"
 msgid "_Title:"
 msgstr "_Beoszt�s:"
 
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:241
 msgid "As _Minicards"
 msgstr "_K�rty�kk�nt"
 
-#: addressbook/gui/component/addressbook.c:243
+#: addressbook/gui/component/addressbook.c:247
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "_T�bl�zatk�nt"
 
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:399
 #, c-format
 msgid "Enter password for %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:440
+#: addressbook/gui/component/addressbook.c:427
 msgid "Unable to open addressbook"
 msgstr "Nem tudom megnyitni a c�mjegyz�ket"
 
-#: addressbook/gui/component/addressbook.c:445
+#: addressbook/gui/component/addressbook.c:432
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -774,183 +769,183 @@ msgstr ""
 "haszn�lni egy LDAP kiszolg�l�t, le kell t�ltened �s\n"
 "telep�tened az OpenLDAP csomagot, �s �jraford�tani az Evol�ci�t.\n"
 
-#: addressbook/gui/component/addressbook.c:568
+#: addressbook/gui/component/addressbook.c:555
 msgid "Show All"
 msgstr "Mutasd mind"
 
-#: addressbook/gui/component/addressbook.c:570
+#: addressbook/gui/component/addressbook.c:557
 msgid "Advanced..."
 msgstr "Halad�..."
 
-#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:587
 msgid "Any field contains"
 msgstr "B�rmely mez� tartalmazza"
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:588
 msgid "Name contains"
 msgstr "A n�v tartalmaz"
 
-#: addressbook/gui/component/addressbook.c:602
+#: addressbook/gui/component/addressbook.c:589
 msgid "Email contains"
 msgstr "Email tartalmaz"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:732
 msgid "The URI that the Folder Browser will display"
 msgstr "Az URI amit a Mappa B�ng�sz� meg fog nyitni"
 
-#: addressbook/gui/component/addressbook-storage.c:95
+#: addressbook/gui/component/addressbook-storage.c:99
 #, fuzzy
 msgid "Other Contacts"
 msgstr "N�vjegy t�rl�se?"
 
-#: addressbook/gui/component/addressbook-config.c:143
+#: addressbook/gui/component/addressbook-config.c:148
 #, fuzzy
 msgid "LDAP Server"
 msgstr "LDAP kiszolg�l�:"
 
-#: addressbook/gui/component/addressbook-config.c:145
+#: addressbook/gui/component/addressbook-config.c:150
 #, fuzzy
 msgid "File"
 msgstr "_Mobil"
 
-#: addressbook/gui/component/addressbook-config.c:148
+#: addressbook/gui/component/addressbook-config.c:153
 #, fuzzy
 msgid "Unknown addressbook type"
 msgstr "Nem tudom megnyitni a c�mjegyz�ket"
 
-#: addressbook/gui/component/addressbook-config.c:158
+#: addressbook/gui/component/addressbook-config.c:163
 msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:261
+#: 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-store.c:145
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
 msgid "Password"
 msgstr "Jelsz�"
 
-#: addressbook/gui/component/addressbook-config.c:162
+#: addressbook/gui/component/addressbook-config.c:167
 msgid "SASL"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:165
+#: addressbook/gui/component/addressbook-config.c:170
 #, fuzzy
 msgid "Unknown auth type"
 msgstr "Ismeretlen hiba"
 
-#: addressbook/gui/component/addressbook-config.c:174
+#: addressbook/gui/component/addressbook-config.c:179
 #, fuzzy
 msgid "Base"
 msgstr "Lap"
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:178
+#: addressbook/gui/component/addressbook-config.c:183
 #, fuzzy
 msgid "Subtree"
 msgstr "Forr�s"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-config.c:186
 msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:348
+#: addressbook/gui/component/addressbook-config.c:353
 msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:349
+#: addressbook/gui/component/addressbook-config.c:354
 msgid "FIXME Bind DN Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:351
+#: addressbook/gui/component/addressbook-config.c:356
+#: mail/mail-config.glade.h:50
 msgid "Remember this password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:401
+#: addressbook/gui/component/addressbook-config.c:406
 #: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Host:"
 msgstr "�r�k"
 
-#: addressbook/gui/component/addressbook-config.c:402
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "FIXME Host help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:404
+#: addressbook/gui/component/addressbook-config.c:409
 #, fuzzy
 msgid "Port:"
 msgstr "Priorit�s:"
 
-#: addressbook/gui/component/addressbook-config.c:405
+#: addressbook/gui/component/addressbook-config.c:410
 msgid "FIXME Port help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/component/addressbook-config.c:414
 msgid "Root DN:"
 msgstr "Root DN:"
 
-#: addressbook/gui/component/addressbook-config.c:410
+#: addressbook/gui/component/addressbook-config.c:415
 msgid "FIXME Root DN help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:430
+#: addressbook/gui/component/addressbook-config.c:435
 #, fuzzy
 msgid "Search Scope:"
 msgstr "Keres�s"
 
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:8
+#: addressbook/gui/component/addressbook-config.c:489
 msgid "Authentication:"
 msgstr "Authentik�ci�:"
 
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
+#: addressbook/gui/component/addressbook-config.c:507
+#: mail/mail-config.glade.h:44
 msgid "Path:"
 msgstr "�tvonal:"
 
-#: addressbook/gui/component/addressbook-config.c:503
+#: addressbook/gui/component/addressbook-config.c:508
 msgid "FIXME Path Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:508
+#: addressbook/gui/component/addressbook-config.c:513
 #, fuzzy
 msgid "Create path if it doesn't exist."
 msgstr "A f�jl nem l�tezik."
 
-#: addressbook/gui/component/addressbook-config.c:642
+#: addressbook/gui/component/addressbook-config.c:647
 #, fuzzy
 msgid "Edit Addressbook"
 msgstr "C�mjegyz�kbe ment�s"
 
-#: addressbook/gui/component/addressbook-config.c:644
+#: addressbook/gui/component/addressbook-config.c:649
 #, fuzzy
 msgid "Add Addressbook"
 msgstr "C�mjegyz�kbe ment�s"
 
-#: addressbook/gui/component/addressbook-config.c:660
+#: 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:666
-#: mail/mail-config.glade.h:41
+#: addressbook/gui/component/addressbook-config.c:671
+#: mail/mail-config.glade.h:35
 msgid "Name:"
 msgstr "N�v:"
 
-#: addressbook/gui/component/addressbook-config.c:667
+#: addressbook/gui/component/addressbook-config.c:672
 msgid "FIXME Name help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:669
+#: 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 "Le�r�s:"
 
-#: addressbook/gui/component/addressbook-config.c:670
+#: addressbook/gui/component/addressbook-config.c:675
 msgid "FIXME Description help text here"
 msgstr ""
 
@@ -960,23 +955,24 @@ msgid "Addressbook Sources"
 msgstr "Forr�s hozz�ad�sa"
 
 #: 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:571
-#: mail/mail-config.glade.h:20 mail/mail-view.c:150
+#: 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:7 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "T�r�l"
 
 #: 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:22
+#: mail/mail-config.glade.h:23
 msgid "Edit"
 msgstr "Szerkeszt"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:578
 #, fuzzy
 msgid "Name"
 msgstr "N�v:"
@@ -986,49 +982,72 @@ msgstr "N�v:"
 msgid "URI"
 msgstr "URL:"
 
-#: addressbook/gui/component/e-address-widget.c:259
-#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#: addressbook/gui/component/e-address-widget.c:365
+#, fuzzy
+msgid "Disable Queries"
+msgstr "Megl�v� mez�k"
+
+#: 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"
 msgstr "N�vjegy t�rl�se?"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for displaying an address."
+msgid "A Bonobo control for an address popup."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A sample Bonobo control which displays an addressbook."
+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 "Konfigur�ci�s eszk�z az Evol�ci� c�mjegyz�k csatorn�j�hoz.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #, fuzzy
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evol�ci� c�mlista csatorna"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: 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:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 #, fuzzy
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: 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:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the Addressbook's address popup"
+msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 #, fuzzy
 msgid "Factory for the Evolution addressbook component."
 msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 #, fuzzy
 msgid "Factory for the sample Addressbook control"
 msgstr "C�mjegyz�kben val� keres�shez kattints ide"
@@ -1042,21 +1061,18 @@ msgstr "Evol�ci� c�mlista csatorna"
 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
+#: 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 "T�rl�s"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#: addressbook/gui/component/select-names/e-select-names-popup.c:146
 #, fuzzy
 msgid "Remove All"
 msgstr "T�rl�s"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
-msgid "Edit Contact Info"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Keres�s..."
@@ -1074,7 +1090,7 @@ msgstr "V�lassz neveket"
 msgid "Select name from:"
 msgstr "V�lassz egy nevet a list�b�l:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
 msgid "Search"
 msgstr "Keres�s"
 
@@ -1186,83 +1202,184 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:481
-#: addressbook/gui/widgets/e-minicard.c:435
+#: 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
 msgid "Save as VCard"
 msgstr "VCard-k�nt ment�s"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-minicard.c:669
+msgid "Send contact to other"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-minicard.c:670
+#, fuzzy
+msgid "Send message to contact"
+msgstr "FIXME: �ze_net ennek a szem�lynek"
+
+#: 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
+msgid "Print"
+msgstr "Nyomtat"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-minicard.c:672
+#, fuzzy
+msgid "Print Envelope"
+msgstr "Lev�l _nyomtat�sa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:641
 #, fuzzy
 msgid "* Click here to add a contact *"
 msgstr "<kattints ide a d�tum kiv�laszt�s�hoz>"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/gui/widgets/e-addressbook-view.c:642
+#, fuzzy
+msgid "File As"
+msgstr "F�jl mint:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:644
 #, fuzzy
 msgid "Email"
 msgstr "2. email"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:645
+#, fuzzy
+msgid "Primary Phone"
+msgstr "Els�dleges"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:646
+#, fuzzy
+msgid "Assistant Phone"
+msgstr "Asszisztens"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:647
+#, fuzzy
+msgid "Business Phone"
+msgstr "2. �zleti"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:648
+#, fuzzy
+msgid "Callback Phone"
+msgstr "Visszah�v�s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:649
+#, fuzzy
+msgid "Company Phone"
+msgstr "V�llalat"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:650
+#, fuzzy
+msgid "Home Phone"
+msgstr "2. Otthoni"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:651
 msgid "Organization"
 msgstr "Szervezet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:595
+#: addressbook/gui/widgets/e-addressbook-view.c:652
+#, fuzzy
+msgid "Business Address"
+msgstr "2. �zleti"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:653
+#, fuzzy
+msgid "Home Address"
+msgstr "A c�m ellen�rz�se"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:654
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "Mobil"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:658
+#, fuzzy
+msgid "Business Phone 2"
+msgstr "2. �zleti"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:659
+#, fuzzy
+msgid "Home Phone 2"
+msgstr "2. Otthoni"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:661
+#, fuzzy
+msgid "Other Phone"
+msgstr "N�vjegy t�rl�se?"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:666
+#, fuzzy
+msgid "TTY"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:667
+#, fuzzy
+msgid "Other Address"
+msgstr "A c�m ellen�rz�se"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:670
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:596
+#: addressbook/gui/widgets/e-addressbook-view.c:671
 #, fuzzy
 msgid "Department"
 msgstr "_Oszt�ly:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:597
+#: addressbook/gui/widgets/e-addressbook-view.c:672
 #, fuzzy
 msgid "Office"
 msgstr "_Hivatal:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:673
 #, fuzzy
 msgid "Title"
 msgstr "_Beoszt�s:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:674
 #, fuzzy
 msgid "Profession"
 msgstr "_Foglalkoz�s:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:600
+#: addressbook/gui/widgets/e-addressbook-view.c:675
 #, fuzzy
 msgid "Manager"
 msgstr "Szem�lyh�v�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 #, fuzzy
 msgid "Nickname"
 msgstr "Be_cen�v:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-view.c:678
 #, fuzzy
 msgid "Spouse"
 msgstr "H�za_st�rs:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: addressbook/gui/widgets/e-addressbook-view.c:679
 #, fuzzy
 msgid "Note"
 msgstr "Semmi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:606
-#, fuzzy
-msgid "Click here to add a contact"
-msgstr "<kattints ide a d�tum kiv�laszt�s�hoz>"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-minicard-control.c:282
 msgid "Save in addressbook"
 msgstr "C�mjegyz�kbe ment�s"
 
-#: addressbook/gui/widgets/e-minicard-view.c:141
+#: addressbook/gui/widgets/e-minicard-view.c:166
 msgid ""
 "\n"
 "\n"
@@ -1276,7 +1393,7 @@ msgstr ""
 "\n"
 "�j n�vjegy k�sz�t�s�hez kattints kett�t ide."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #, fuzzy
 msgid "Card View"
 msgstr "K�rtya:"
@@ -1462,126 +1579,127 @@ msgstr "Nem tudom a pilot Calendar application blokkj�t olvasni"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nem tudom a pilot Calendar ToDo blokkj�t olvasni"
 
-#: calendar/gui/calendar-commands.c:233
+#: calendar/gui/calendar-commands.c:266
 msgid "File not found"
 msgstr "Nem tal�lom a f�jlt"
 
-#: calendar/gui/calendar-commands.c:257
+#: calendar/gui/calendar-commands.c:290
 msgid "Open calendar"
 msgstr "Napt�r megnyit�sa"
 
-#: calendar/gui/calendar-commands.c:299
+#: calendar/gui/calendar-commands.c:332
 msgid "Save calendar"
 msgstr "Napt�r ment�se"
 
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:468
 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:360 calendar/gui/calendar-model.c:895
+#: calendar/gui/e-calendar-table.c:330
 msgid "Public"
 msgstr "Nyilv�nos"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
+#: calendar/gui/e-calendar-table.c:331
 msgid "Private"
 msgstr "Szem�lyes"
 
-#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
+#: calendar/gui/e-calendar-table.c:332
 msgid "Confidential"
 msgstr "Bizalmas"
 
-#: 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:200
+#: 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
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "N"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "E"
 msgstr "K"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "W"
 msgstr "Ny"
 
-#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: 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:351
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
 msgid "High"
 msgstr "Magas"
 
-#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
-#: calendar/gui/calendar-model.c:1596
+#: 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:352
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
 msgid "Normal"
 msgstr "Norm�lis"
 
-#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: 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:353
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
 msgid "Low"
 msgstr "Alacsony"
 
-#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
+#: calendar/gui/e-calendar-table.c:406
 msgid "Transparent"
 msgstr "�ttetsz�"
 
-#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
+#: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: 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:425
+#: calendar/gui/e-calendar-table.c:426
 msgid "Not Started"
 msgstr "Nem indult m�g el"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: 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:426
+#: calendar/gui/e-calendar-table.c:427
 msgid "In Progress"
 msgstr "Folyamatban"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: 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:427
+#: calendar/gui/e-calendar-table.c:428
 #, fuzzy
 msgid "Completed"
 msgstr "% k�sz:"
 
-#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: 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:428
+#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
+#: camel/camel-service.c:586
 #, fuzzy
 msgid "Cancelled"
 msgstr "M�gsem"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
 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:800 e-util/e-time-utils.c:285
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:805
+#: calendar/gui/calendar-model.c:799
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1592,24 +1710,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:885
+#: calendar/gui/calendar-model.c:879
 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:756
-#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
-#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
-#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
-#: 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: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
 msgid "None"
 msgstr "Semmi"
 
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:967
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1619,40 +1736,40 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1013
+#: calendar/gui/calendar-model.c:1007
 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, bez�r�lag"
 
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1048
 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/calendar-model.c:1061
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:355
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1108
+#: calendar/gui/calendar-model.c:1102
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1598
+#: calendar/gui/calendar-model.c:1571
 #, fuzzy
 msgid "Recurring"
 msgstr "Ism�tl�d�s"
 
-#: calendar/gui/calendar-model.c:1600
+#: calendar/gui/calendar-model.c:1573
 #, fuzzy
 msgid "Assigned"
 msgstr "Pontsz�m hozz�rendel�se"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 #, fuzzy
 msgid "No"
 msgstr "Most"
@@ -1725,12 +1842,12 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Nem tudom a bonobo-t elind�tani"
 
-#: calendar/gui/alarm-notify/notify-main.c:73
+#: calendar/gui/alarm-notify/notify-main.c:77
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr ""
@@ -1738,15 +1855,15 @@ msgstr ""
 "%s\n"
 "Hiba: %s"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+#: calendar/gui/dialogs/alarm-notify-dialog.c:189
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Riaszt�s id�pontja: %A %b %d %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
+#: calendar/gui/dialogs/alarm-notify-dialog.c:196
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "Tal�lkoz� figyelmeztet�s: %A %b %d %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
+#: calendar/gui/dialogs/alarm-notify-dialog.c:207
 msgid "No summary available."
 msgstr "Nincs el�rhet� �sszegz�s."
 
@@ -1837,7 +1954,7 @@ msgid "Display options"
 msgstr "Megjelen�t�si be�ll�t�sok"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:162
 msgid "Due Date"
 msgstr "Lej�rat"
 
@@ -1859,7 +1976,7 @@ msgid "Fri"
 msgstr "P�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
 msgid "Friday"
 msgstr "P�ntek"
 
@@ -1888,7 +2005,7 @@ msgid "Mon"
 msgstr "H�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
 msgid "Monday"
 msgstr "H�tf�"
 
@@ -1901,11 +2018,12 @@ msgid "Overdue Items:"
 msgstr "Lej�rt elemek:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: mail/mail-config.glade.h:45
 msgid "Pick a color"
 msgstr "V�lassz egy sz�nt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:165
 msgid "Priority"
 msgstr "Priorit�s"
 
@@ -1923,7 +2041,7 @@ msgid "Sat"
 msgstr "Szo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:482
 msgid "Saturday"
 msgstr "Szombat"
 
@@ -1949,7 +2067,7 @@ msgid "Sun"
 msgstr "Va"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:483
 msgid "Sunday"
 msgstr "Vas�rnap"
 
@@ -1962,7 +2080,7 @@ msgid "Thu"
 msgstr "Cs�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
 msgid "Thursday"
 msgstr "Cs�t�rt�k"
 
@@ -1983,7 +2101,7 @@ msgid "Tue"
 msgstr "Ke"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
 msgid "Tuesday"
 msgstr "Kedd"
 
@@ -1996,7 +2114,7 @@ msgid "Wed"
 msgstr "Sze"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
 msgid "Wednesday"
 msgstr "Szerda"
 
@@ -2009,46 +2127,46 @@ msgid "minutes before they occur."
 msgstr "perc bek�vetkez�s�kig."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:78
 msgid "seconds."
 msgstr "m�sodperc."
 
-#: calendar/gui/dialogs/delete-comp.c:68
+#: calendar/gui/dialogs/delete-comp.c:70
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 "T�nyleg t�r�lni akarod\n"
 "ezt a n�vjegyet?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:73
 #, fuzzy
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 "T�nyleg t�r�lni akarod\n"
 "ezt a n�vjegyet?"
 
-#: calendar/gui/dialogs/delete-comp.c:77
+#: calendar/gui/dialogs/delete-comp.c:79
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 "T�nyleg t�r�lni akarod\n"
 "ezt a n�vjegyet?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:82
 #, fuzzy
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 "T�nyleg t�r�lni akarod\n"
 "ezt a n�vjegyet?"
 
-#: calendar/gui/dialogs/delete-comp.c:86
+#: calendar/gui/dialogs/delete-comp.c:88
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 "T�nyleg t�r�lni akarod\n"
 "ezt a n�vjegyet?"
 
-#: calendar/gui/dialogs/delete-comp.c:89
+#: calendar/gui/dialogs/delete-comp.c:91
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
@@ -2065,7 +2183,7 @@ msgid "% Comp_lete:"
 msgstr "% k�sz:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:158
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Besorol�s"
@@ -2137,314 +2255,328 @@ msgstr "_Priorit�s:"
 msgid "_Status:"
 msgstr "_St�tusz:"
 
-#: calendar/gui/dialogs/task-editor.c:689
+#: calendar/gui/dialogs/task-editor.c:697
 msgid "Edit Task"
 msgstr "Feladat v�ge"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
+#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
 msgid "No summary"
 msgstr "Nincs �sszegz�s"
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
+#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
 #, c-format
 msgid "Appointment - %s"
 msgstr "Id�pont - %s"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
 #, c-format
 msgid "Task - %s"
 msgstr "Feladat - %s"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
+#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Napl� bejegyz�s - %s"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:157
 #, fuzzy
 msgid "Categories"
 msgstr "kateg�ri�k"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:159
 #, fuzzy
 msgid "Completion Date"
 msgstr "Elv�gezve"
 
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:160
 #, fuzzy
 msgid "End Date"
 msgstr "_V�g id�pont:"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:161
 #, fuzzy
 msgid "Start Date"
 msgstr "Ke_zd�si d�tum:"
 
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:163
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:164
 #, fuzzy
 msgid "Percent complete"
 msgstr "Megjel�l�s mint k�sz feladat"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:166
 #, fuzzy
 msgid "Summary"
 msgstr "�_sszegz�s"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:167
 #, fuzzy
 msgid "Transparency"
 msgstr "�ttetsz�"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:168
 #, fuzzy
 msgid "URL"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/e-calendar-table.c:169
 msgid "Alarms"
 msgstr "�breszt�k"
 
-#: calendar/gui/e-calendar-table.c:169
+#: calendar/gui/e-calendar-table.c:170
 #, fuzzy
 msgid "Click here to add a task"
 msgstr "C�mjegyz�kben val� keres�shez kattints ide"
 
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:374
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:375
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:376
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:377
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:378
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:379
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:380
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:381
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:382
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:383
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:384
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:550
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark Complete"
 msgstr "K�sznek jel�l"
 
-#: calendar/gui/e-calendar-table.c:551
+#: calendar/gui/e-calendar-table.c:552
 msgid "Mark the task complete"
 msgstr "Megjel�l�s mint k�sz feladat"
 
-#: calendar/gui/e-calendar-table.c:556
+#: calendar/gui/e-calendar-table.c:557
 #, fuzzy
 msgid "Edit this task..."
 msgstr "A megbesz�l�s szerkeszt�se..."
 
-#: calendar/gui/e-calendar-table.c:557
+#: calendar/gui/e-calendar-table.c:558
 #, fuzzy
 msgid "Edit the task"
 msgstr "Feladat v�ge"
 
-#: calendar/gui/e-calendar-table.c:559
+#: calendar/gui/e-calendar-table.c:560
 #: ui/evolution-task-editor-dialog.xml.h:19
 #, fuzzy
 msgid "Delete this task"
 msgstr "A feladat t�rl�se"
 
-#: calendar/gui/e-calendar-table.c:560
+#: calendar/gui/e-calendar-table.c:561
 msgid "Delete the task"
 msgstr "A feladat t�rl�se"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i perces oszt�s"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
-#: calendar/gui/e-week-view-main-item.c:321
+#: 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"
 
 #. 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:1288
-#: calendar/gui/e-week-view-main-item.c:330
+#: 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:279 calendar/gui/e-day-view.c:1301
-#: calendar/gui/e-week-view-main-item.c:344
+#: 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"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:613
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:617
 msgid "am"
 msgstr "de"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
-#: calendar/gui/print.c:612
+#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
+#: calendar/gui/print.c:616
 msgid "pm"
 msgstr "du"
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
-#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
+#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "New Appointment..."
+msgid "New Appointment"
 msgstr "�j _id�pont"
 
-#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
-#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
+#, fuzzy
+msgid "New All Day Event"
+msgstr "Minden napos esem�ny"
+
+#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
+#, fuzzy
+msgid "Go to Today"
+msgstr "Ugorj m�ra"
+
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#, fuzzy
+msgid "Go to Date..."
+msgstr "D�tumra ugr�s"
+
+#: 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 "Megnyit�s"
 
-#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete this Appointment"
 msgstr "A megbesz�l�s t�rl�se"
 
-#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: 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 "V�lassz mapp�t"
 
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
 #, fuzzy
 msgid "Make this Occurrence Movable"
 msgstr "A megbesz�l�s mozgathat�v� t�tele"
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "A megjelen�s t�rl�se"
 
-#: calendar/gui/e-day-view.c:3047
+#: calendar/gui/e-day-view.c:3179
 #, fuzzy
 msgid "Delete all Occurrences"
 msgstr "Az �sszes megjelen�s t�rl�se"
 
-#: calendar/gui/e-itip-control.c:153
+#: calendar/gui/e-itip-control.c:161
 msgid "I couldn't update your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
+#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
 #, fuzzy
 msgid "Component successfully updated."
 msgstr "Az Evol�ci� f�jljai sikeresen telep�ltek."
 
-#: calendar/gui/e-itip-control.c:165
+#: calendar/gui/e-itip-control.c:173
 msgid "There was an error loading the calendar file."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:189
+#: calendar/gui/e-itip-control.c:197
 msgid "I couldn't open your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
+#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
 msgid "I couldn't load your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:462
+#: calendar/gui/e-itip-control.c:470
 msgid "I couldn't read your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:475
+#: calendar/gui/e-itip-control.c:483
 msgid "This is a reply from someone who was uninvited!"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:491
+#: calendar/gui/e-itip-control.c:499
 msgid "I couldn't update your calendar store."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:532
+#: calendar/gui/e-itip-control.c:540
 msgid "I couldn't delete the calendar component!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:542
+#: calendar/gui/e-itip-control.c:550
 #, fuzzy
 msgid "Component successfully deleted."
 msgstr "Az Evol�ci� f�jljai sikeresen telep�ltek."
 
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:694
 #, fuzzy
 msgid "I don't recognize this type of calendar component."
 msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:780
 #, fuzzy
 msgid "Add to Calendar"
 msgstr "Napt�r"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:814
 #, fuzzy
-msgid "Accept"
+msgid " Accept "
 msgstr "szept"
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:815
 #, fuzzy
-msgid "Decline"
+msgid " Decline "
 msgstr "T�r�l"
 
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
+#: calendar/gui/e-itip-control.c:816
+#, fuzzy
+msgid " Tentative "
 msgstr "K�s�rleti"
 
-#: calendar/gui/e-itip-control.c:852
+#: calendar/gui/e-itip-control.c:860
 #, fuzzy
 msgid "Update Calendar"
 msgstr "Napt�r megnyit�sa"
 
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:883
 #, fuzzy
 msgid "Cancel Meeting"
 msgstr "M�gsem"
@@ -2463,7 +2595,7 @@ msgstr ""
 msgid "Calendar Message"
 msgstr "Napt�r"
 
-#: calendar/gui/e-itip-control.glade.h:5
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
 #, fuzzy
 msgid "Date:"
 msgstr "Lej�rat"
@@ -2478,9 +2610,10 @@ msgstr "Napt�r nyomtat�sa"
 msgid "Organizer:"
 msgstr "Szervezet:"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
-msgid "Sender"
-msgstr "Felad�"
+#: calendar/gui/e-itip-control.glade.h:10
+#, fuzzy
+msgid "Server Message:"
+msgstr "Ment mint..."
 
 #: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
@@ -2572,30 +2705,30 @@ msgid ""
 "Time"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
-#: mail/message-list.c:1171
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
+#: mail/message-list.c:1052
 #, fuzzy
 msgid "Status"
 msgstr "_St�tusz:"
 
-#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
-#: calendar/gui/e-tasks.c:501
+#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
+#: calendar/gui/e-tasks.c:502
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:154
+#: calendar/gui/e-tasks.c:155
 #, fuzzy
 msgid "Category:"
 msgstr ""
 "\n"
 "Kateg�ri�k:"
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:298
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: calendar/gui/e-tasks.c:309
+#: calendar/gui/e-tasks.c:310
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
@@ -2603,11 +2736,16 @@ 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
+#: calendar/gui/e-week-view-main-item.c:342
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3255
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+#, fuzzy
+msgid "New Appointment..."
+msgstr "�j _id�pont"
+
+#: calendar/gui/e-week-view.c:3314
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Az �sszes megjelen�s t�rl�se"
@@ -2647,7 +2785,7 @@ msgid "No recurrence"
 msgstr "Nincs ism�tl�d�s"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1577
+#: calendar/gui/event-editor.c:1579
 msgid "Play a sound"
 msgstr ""
 
@@ -2669,24 +2807,24 @@ msgid "Reminder"
 msgstr "Eml�keztet�"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1586
+#: calendar/gui/event-editor.c:1588
 #, fuzzy
 msgid "Run a program"
 msgstr "_Program ind�t�sa:"
 
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1583
+#: calendar/gui/event-editor.c:1585
 #, fuzzy
 msgid "Send an email"
 msgstr "Levelek let�lt�se"
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
 #, fuzzy
 msgid "Settings..."
 msgstr "Be�ll�t�sok tesztel�se"
 
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1580
+#: calendar/gui/event-editor.c:1582
 #, fuzzy
 msgid "Show a dialog"
 msgstr "�rnyal�s"
@@ -2708,12 +2846,11 @@ msgstr "_Kezd�si id�:"
 msgid "_Starting date:"
 msgstr "Ke_zd�si d�tum:"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
 msgid "after"
 msgstr "ut�na"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
 msgid "before"
 msgstr "el�tte"
 
@@ -2739,7 +2876,7 @@ msgstr "�r�kk�"
 msgid "hour(s)"
 msgstr "�r�k"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
 #, fuzzy
 msgid "minute(s)"
 msgstr "percek"
@@ -2765,107 +2902,107 @@ msgstr "h�ten"
 msgid "year(s)"
 msgstr "�vben"
 
-#: calendar/gui/event-editor.c:371
+#: calendar/gui/event-editor.c:373
 msgid "Edit Appointment"
 msgstr "Megbesz�l�s szerkeszt�se"
 
-#: calendar/gui/event-editor.c:449
+#: calendar/gui/event-editor.c:451
 msgid "on"
 msgstr "ekkor:"
 
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
 msgid "day"
 msgstr "nap"
 
-#: calendar/gui/event-editor.c:601
+#: calendar/gui/event-editor.c:603
 msgid "on the"
 msgstr "ezen:"
 
-#: calendar/gui/event-editor.c:608
+#: calendar/gui/event-editor.c:610
 msgid "th"
 msgstr "."
 
-#: calendar/gui/event-editor.c:754
+#: calendar/gui/event-editor.c:756
 #, fuzzy
 msgid "occurrences"
 msgstr "el�fordul�sok"
 
-#: calendar/gui/event-editor.c:871
+#: calendar/gui/event-editor.c:873
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1532
+#: calendar/gui/event-editor.c:1534
 #, fuzzy, c-format
 msgid " %d days"
 msgstr "napok"
 
-#: calendar/gui/event-editor.c:1534
+#: calendar/gui/event-editor.c:1536
 #, fuzzy
 msgid " 1 day"
 msgstr "nap"
 
-#: calendar/gui/event-editor.c:1537
+#: calendar/gui/event-editor.c:1539
 #, fuzzy, c-format
 msgid " %d weeks"
 msgstr "hetek"
 
-#: calendar/gui/event-editor.c:1539
+#: calendar/gui/event-editor.c:1541
 #, fuzzy
 msgid " 1 week"
 msgstr "H�t sz�m�nak mutat�sa"
 
-#: calendar/gui/event-editor.c:1542
+#: calendar/gui/event-editor.c:1544
 #, fuzzy, c-format
 msgid " %d hours"
 msgstr "�r�k"
 
-#: calendar/gui/event-editor.c:1544
+#: calendar/gui/event-editor.c:1546
 #, fuzzy
 msgid " 1 hour"
 msgstr "�ra"
 
-#: calendar/gui/event-editor.c:1547
+#: calendar/gui/event-editor.c:1549
 #, fuzzy, c-format
 msgid " %d minutes"
 msgstr "percek"
 
-#: calendar/gui/event-editor.c:1549
+#: calendar/gui/event-editor.c:1551
 #, fuzzy
 msgid " 1 minute"
 msgstr "10 perc"
 
-#: calendar/gui/event-editor.c:1552
+#: calendar/gui/event-editor.c:1554
 #, fuzzy, c-format
 msgid " %d seconds"
 msgstr " m�sodperc ut�n"
 
-#: calendar/gui/event-editor.c:1554
+#: calendar/gui/event-editor.c:1556
 #, fuzzy
 msgid " 1 second"
 msgstr " m�sodperc ut�n"
 
-#: calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1603
 #, fuzzy
 msgid " before start of appointment"
 msgstr "A megbesz�l�s t�rl�se"
 
-#: calendar/gui/event-editor.c:1603
+#: calendar/gui/event-editor.c:1605
 #, fuzzy
 msgid " after start of appointment"
 msgstr "A megbesz�l�s t�rl�se"
 
-#: calendar/gui/event-editor.c:1611
+#: calendar/gui/event-editor.c:1613
 #, fuzzy
 msgid " before end of appointment"
 msgstr "Minden tal�lkoz�ra figyelmeztess"
 
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/event-editor.c:1615
 #, fuzzy
 msgid " after end of appointment"
 msgstr "A megbesz�l�s t�rl�se"
 
-#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
-#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
+#: 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"
 
@@ -2907,14 +3044,14 @@ msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
 msgid "Factory for the sample Calendar control"
 msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
 
-#: calendar/gui/gnome-cal.c:695
+#: calendar/gui/gnome-cal.c:700
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 "Nem tudom elk�sz�teni a megadott mapp�t:\n"
 "%s"
 
-#: calendar/gui/gnome-cal.c:706
+#: calendar/gui/gnome-cal.c:711
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -2989,202 +3126,202 @@ msgstr "okt�ber"
 msgid "September"
 msgstr "szeptember"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:306
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Su"
 msgstr "V"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Mo"
 msgstr "H"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Tu"
 msgstr "K"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "We"
 msgstr "Sze"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Th"
 msgstr "Cs"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Fr"
 msgstr "P"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Sa"
 msgstr "Szo"
 
-#: calendar/gui/print.c:944
+#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Feladatok"
 
 #. Day
-#: calendar/gui/print.c:1074
+#: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
 msgstr "Mai nap (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1089
+#: calendar/gui/print.c:1093
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1104
 #, fuzzy, c-format
 msgid "Current week (%s - %s)"
 msgstr "Aktu�lis h�t (%s %s %d - %s %d %d)"
 
 #. Month
-#: calendar/gui/print.c:1108
+#: calendar/gui/print.c:1112
 #, fuzzy
 msgid "Current month (%b %Y)"
 msgstr "Aktu�lis h�nap (%a %Y)"
 
 #. Year
-#: calendar/gui/print.c:1115
+#: calendar/gui/print.c:1119
 msgid "Current year (%Y)"
 msgstr "Ez�v (%Y)"
 
-#: calendar/gui/print.c:1152
+#: calendar/gui/print.c:1156
 msgid "Print Calendar"
 msgstr "Napt�r nyomtat�sa"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:32
+#: 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
 msgid "Print Preview"
 msgstr "Nyomtat�si el�n�zet"
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/tasks-control.c:108
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "Az URI amit a napt�r megjelen�t"
@@ -3217,321 +3354,469 @@ 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 "VHKSCPS"
 
-#: camel/camel-filter-driver.c:790
+#: camel/camel-cipher-context.c:169
+#, fuzzy
+msgid "Signing is not supported by this cipher"
+msgstr "A megadott t�pus nem t�mogatott ebben a t�rol�ban."
+
+#: camel/camel-cipher-context.c:207
+#, fuzzy
+msgid "Clearsigning is not supported by this cipher"
+msgstr "A megadott t�pus nem t�mogatott ebben a t�rol�ban."
+
+#: camel/camel-cipher-context.c:245
+#, fuzzy
+msgid "Verifying is not supported by this cipher"
+msgstr "A megadott t�pus nem t�mogatott ebben a t�rol�ban."
+
+#: camel/camel-cipher-context.c:286
+#, fuzzy
+msgid "Encryption is not supported by this cipher"
+msgstr "A megadott t�pus nem t�mogatott ebben a t�rol�ban."
+
+#: camel/camel-cipher-context.c:326
+#, fuzzy
+msgid "Decryption is not supported by this cipher"
+msgstr "A megadott t�pus nem t�mogatott ebben a t�rol�ban."
+
+#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#, fuzzy
+msgid "Syncing folders"
+msgstr "Szinkroniz�l�s"
+
+#: camel/camel-filter-driver.c:643
+#, fuzzy
+msgid "Unable to open spool folder"
+msgstr "Nem tudom megnyitni a c�mjegyz�ket"
+
+#: camel/camel-filter-driver.c:652
+#, fuzzy
+msgid "Unable to process spool folder"
+msgstr "Nem tudom a dial�gust elk�sz�teni."
+
+#: camel/camel-filter-driver.c:666
+#, fuzzy
+msgid "Getting message %d (%d%%)"
+msgstr "Lev�l lista rendez�se t�ma szerint"
+
+#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#, fuzzy, c-format
+msgid "Failed message %d"
+msgstr "Lev�lt�rzs"
+
+#: camel/camel-filter-driver.c:671
+#, fuzzy
+msgid "Cannot open message"
+msgstr "Nem tudom be�ll�tani a helyi t�rter�letet -- %s"
+
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#, fuzzy
+msgid "Syncing folder"
+msgstr "Szinkroniz�l�s"
+
+#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
+#, fuzzy
+msgid "Complete"
+msgstr "% k�sz:"
+
+#: camel/camel-filter-driver.c:748
+#, fuzzy, c-format
+msgid "Getting message %d of %d"
+msgstr "Lev�l mozgat�sa m�s mapp�ba"
+
+#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#, fuzzy, c-format
+msgid "Failed at message %d of %d"
+msgstr "Lev�l mozgat�sa m�s mapp�ba"
+
+#: camel/camel-filter-driver.c:866
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "F�jl ment�si hiba: %s"
 
-#: camel/camel-filter-driver.c:795
+#: camel/camel-filter-driver.c:871
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "F�jl ment�si hiba: %s"
 
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "F�jl ment�si hiba: %s"
 
-#: camel/camel-folder-search.c:323
+#: camel/camel-folder-search.c:328
 #, fuzzy, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:338
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr "F�jl ment�si hiba: %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 ""
 
 #. 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 camel/camel-movemail.c:138
+#: camel/camel-movemail.c:185
 #, 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 camel/camel-movemail.c:219
 #, 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:101
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:148
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:197
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:243
+#: camel/camel-movemail.c:245
 #, fuzzy, c-format
 msgid "Error reading mail file: %s"
 msgstr "F�jl bet�lt�si hiba: %s"
 
-#: camel/camel-movemail.c:254
+#: camel/camel-movemail.c:256
 #, fuzzy, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "F�jl ment�si hiba: %s"
 
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:274
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:304
+#: camel/camel-movemail.c:306
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:318
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:356
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:357
 msgid "(Unknown error)"
 msgstr "(Ismeretlen hiba)"
 
-#: camel/camel-provider.c:137
+#: camel/camel-movemail.c:587
+#, fuzzy, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "F�jl ment�si hiba: %s"
+
+#: camel/camel-pgp-context.c:186
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:189
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr ""
+
+#: camel/camel-pgp-context.c:509
+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
+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
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Nem siker�lt cs�vezet�ket l�trehozni a GPG/PGP-hez: %s"
+
+#: camel/camel-pgp-context.c:681
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:871
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:888
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1011
+msgid "No plaintext to encrypt."
+msgstr ""
+
+#: camel/camel-pgp-context.c:1037
+msgid "No recipients specified"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1227
+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:181
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s server %s"
 msgstr "%s kiszolg�l� %s"
 
-#: camel/camel-remote-store.c:185
+#: camel/camel-remote-store.c:190
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:232
+#: camel/camel-remote-store.c:240
 #, fuzzy
 msgid "Connection cancelled"
 msgstr "T�r�lve"
 
-#: camel/camel-remote-store.c:235
-#: camel/providers/smtp/camel-smtp-transport.c:244
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:261
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:236
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(ismeretlen kiszolg�l�)"
 
-#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
-#: camel/camel-remote-store.c:448
-#: camel/providers/imap/camel-imap-command.c:289
+#: 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
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Napt�r megnyit�sa"
 
-#: camel/camel-remote-store.c:453
+#: camel/camel-remote-store.c:464
 #, fuzzy
 msgid "Server unexpectedly disconnected"
 msgstr "A kiszolg�l� a felhaszn�l�i nevet visszadobta"
 
-#: 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
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Authentik�ci�:"
 
-#: 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
 #, fuzzy, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
 msgstr "F�jl bet�lt�si hiba: %s"
 
-#: camel/camel-sasl-anonymous.c:130
+#: camel/camel-sasl-anonymous.c:143
 #, fuzzy, c-format
 msgid ""
 "Invalid trace information:\n"
 "%s"
 msgstr "F�jl bet�lt�si hiba: %s"
 
-#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+#: 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:18
+#: 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
 #, fuzzy
 msgid "Server response did not contain authorization data\n"
 msgstr "Az IMAP kiszolg�l� v�lasza nem tartalmaz %s inform�ci�t"
 
-#: 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
 #, fuzzy
 msgid "Server response does not match\n"
 msgstr "Az IMAP kiszolg�l� v�lasza nem tartalmaz %s inform�ci�t"
 
-#: 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 ""
 
-#: 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:381
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:417
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:29
-msgid "PLAIN"
+#: camel/camel-sasl-plain.c:34
+msgid "This option will connect to the server using a simple password."
 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."
-msgstr ""
-
-#: camel/camel-search-private.c:105
+#: camel/camel-search-private.c:110
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:142
+#: camel/camel-service.c:152
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:151
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:168
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:512
+#: camel/camel-service.c:554
+#, fuzzy, c-format
+msgid "Resolving: %s"
+msgstr "'%s' tesztel�se"
+
+#: camel/camel-service.c:581
+#, c-format
+msgid "Failure in name lookup: %s"
+msgstr ""
+
+#: camel/camel-service.c:606
 #, c-format
-msgid "No such host %s."
+msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:515
+#: camel/camel-service.c:608
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
+msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:54
+#: camel/camel-session.c:57
 msgid "Virtual folder email provider"
 msgstr "Virtu�lis mappa email szolg�ltat�"
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:59
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:322
+#: camel/camel-session.c:274 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:417
+#: camel/camel-session.c:462
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3542,119 +3827,147 @@ msgstr ""
 "Hiba: %s"
 
 #. Fill in the new fields
-#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
-#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#: 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
 #, fuzzy
 msgid "Trash"
 msgstr "Feladat"
 
-#: camel/camel-url.c:77
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr ""
-
-#: camel/camel-url.c:92
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
+#: camel/camel-url.c:289
+#, fuzzy, c-format
+msgid "Could not parse URL `%s'"
 msgstr ""
+"Nem tudom m�solni a f�jlokat\n"
+"'%s'-be."
 
-#: camel/camel-url.c:152
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr ""
+#: camel/camel-vee-folder.c:451
+#, fuzzy, c-format
+msgid "No such message %s in %s"
+msgstr "A lev�l tov�bb�t�sa"
 
-#: camel/camel-vee-folder.c:960
+#: camel/camel-vee-folder.c:545
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "A lev�l tov�bb�t�sa"
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:209
 #, 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:217
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Az IMAP parancs sikertelen: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
+#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:272
 #, fuzzy
 msgid "Server response ended too soon."
 msgstr "Az IMAP kiszolg�l� v�lasza nem tartalmaz %s inform�ci�t"
 
-#: camel/providers/imap/camel-imap-command.c:433
+#: camel/providers/imap/camel-imap-command.c:456
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Az IMAP kiszolg�l� v�lasza nem tartalmaz %s inform�ci�t"
 
-#: camel/providers/imap/camel-imap-command.c:469
+#: camel/providers/imap/camel-imap-command.c:490
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:172
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:329
+#: camel/providers/imap/camel-imap-folder.c:351
 #, fuzzy
 msgid "Scanning IMAP folder"
 msgstr "Szinkroniz�l�s"
 
-#: camel/providers/imap/camel-imap-folder.c:837
-#: camel/providers/imap/camel-imap-folder.c:999
+#: camel/providers/imap/camel-imap-folder.c:986
+#: camel/providers/imap/camel-imap-folder.c:1197
+#, fuzzy
+msgid "This message is not currently available"
+msgstr ""
+"Nincs t�rgya a lev�lnek.\n"
+"T�nyleg elk�ldjem?"
+
+#: camel/providers/imap/camel-imap-folder.c:1016
+#: camel/providers/imap/camel-imap-folder.c:1231
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Checking for new mail"
+msgstr "Egy �j n�vjegy k�sz�t�se"
 
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Check for new messages in all folders"
+msgstr "Lev�l mozgat�sa m�s mapp�ba"
+
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+msgid "Folders"
+msgstr "Mapp�k"
+
+#: camel/providers/imap/camel-imap-provider.c:50
+#, fuzzy
+msgid "Show only subscribed folders"
+msgstr "Nem tudom be�ll�tani a helyi t�rter�letet -- %s"
+
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:54
 #, fuzzy
-msgid "Secure IMAPv4"
+msgid "Namespace"
+msgstr "N�v:"
+
+#: 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:61
-msgid "For reading and storing mail on IMAP servers over an SSL connection."
+#: 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:263
+#: 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:415
+#: camel/providers/imap/camel-imap-store.c:440
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap/camel-imap-store.c:450
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Authentik�ci�:"
 
-#: camel/providers/imap/camel-imap-store.c:454
+#: camel/providers/imap/camel-imap-store.c:475
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:469
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:403
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:498
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: camel/providers/imap/camel-imap-store.c:518
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3662,7 +3975,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:772
+#: camel/providers/imap/camel-imap-store.c:865
+#, fuzzy, c-format
+msgid "%s is not a selectable folder"
+msgstr "A kijel�lt mapp�k megtekint�se"
+
+#: camel/providers/imap/camel-imap-store.c:879
 #, fuzzy, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
@@ -3670,171 +3988,180 @@ msgstr ""
 "%s\n"
 "Hiba: %s"
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/imap/camel-imap-store.c:1382
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:39
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "%s helyi lev�lk�nyvt�r"
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:40
 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:49
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:50
 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:59
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:128
+#: camel/providers/local/camel-local-store.c:129
 #, 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:136
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Nem sima f�jl."
 
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:144
+#: camel/providers/local/camel-local-store.c:160
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nem tudom be�ll�tani a helyi t�rter�letet -- %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:175
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s helyi lev�l f�jl"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:241
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:283
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:293
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: 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-maildir-folder.c:150
+#: camel/providers/local/camel-maildir-folder.c:158
+#: camel/providers/local/camel-maildir-folder.c:169
 #, fuzzy, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Lev�l mozgat�sa m�s mapp�ba"
 
-#: 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: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
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr "Nem tudom be�ll�tani a helyi t�rter�letet -- %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:197
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
 #, fuzzy
 msgid "No such message"
 msgstr "A lev�l tov�bb�t�sa"
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:203
 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:96
+#: 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:100
+#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mh-store.c:97
 #, fuzzy, c-format
 msgid "Folder `%s' does not exist."
 msgstr "A f�jl nem l�tezik."
 
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mh-store.c:103
 #, fuzzy, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: camel/providers/local/camel-maildir-store.c:120
+#: camel/providers/local/camel-maildir-store.c:122
 #, fuzzy, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "'%s' nem k�nyvt�r."
 
-#: 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:151
+#: camel/providers/local/camel-maildir-store.c:188
+#: 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:152
 #, fuzzy
 msgid "not a maildir directory"
 msgstr "%s helyi lev�lk�nyvt�r"
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:152
+#, fuzzy, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "Nem tudom be�ll�tani a helyi t�rter�letet -- %s"
+
+#: camel/providers/local/camel-mbox-folder.c:203
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nem tudom be�ll�tani a helyi t�rter�letet -- %s"
 
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Lev�l mozgat�sa m�s mapp�ba"
 
-#: 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:335
+#: camel/providers/local/camel-mbox-folder.c:367
+#: camel/providers/local/camel-mbox-folder.c:380
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr "Nem tudom be�ll�tani a helyi t�rter�letet -- %s"
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:368
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:381
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:92
+#: camel/providers/local/camel-mbox-store.c:94
 #, fuzzy, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -3843,138 +4170,138 @@ msgstr ""
 "Nem tudom m�solni a f�jlokat\n"
 "'%s'-be."
 
-#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mbox-store.c:110
 #, fuzzy, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: 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
 #, fuzzy, c-format
 msgid "`%s' is not a regular file."
 msgstr "Nem sima f�jl."
 
-#: 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:248
 #, fuzzy
 msgid "Summarising folder"
 msgstr "Szinkroniz�l�s"
 
-#: camel/providers/local/camel-mbox-summary.c:245
+#: camel/providers/local/camel-mbox-summary.c:253
 #, 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:295
 #, 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:370
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
+#: camel/providers/local/camel-mbox-summary.c:501
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Szinkroniz�l�s"
 
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:506
+#: camel/providers/local/camel-mbox-summary.c:707
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 "Nem tudom m�solni a f�jlokat\n"
 "'%s'-be."
 
-#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:523
 #, 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:556
 #: camel/providers/local/camel-mbox-summary.c:745
+#: camel/providers/local/camel-mbox-summary.c:753
 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:599
 #, 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:616
 #, 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:634
+#: camel/providers/local/camel-mbox-summary.c:803
 #, 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:643
 #, fuzzy, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 "Nem tudom elk�sz�teni a megadott mapp�t:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:646
+#: camel/providers/local/camel-mbox-summary.c:654
 #, fuzzy, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: camel/providers/local/camel-mbox-summary.c:870
+#: camel/providers/local/camel-mbox-summary.c:878
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ismeretlen hiba: %s"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:149
+#: camel/providers/local/camel-mh-folder.c:157
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Lev�l mozgat�sa m�s mapp�ba"
 
-#: 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' nem k�nyvt�r."
 
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: 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:66
 msgid "Server rejected username"
 msgstr "A kiszolg�l� a felhaszn�l�i nevet visszadobta"
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:72
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:81
 msgid "Server rejected username/password"
 msgstr ""
 
@@ -3998,11 +4325,11 @@ msgstr ""
 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 "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 ""
 
@@ -4028,462 +4355,461 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:145
+#: camel/providers/pop3/camel-pop3-folder.c:149
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "Lev�l �r�sa"
 
-#: camel/providers/pop3/camel-pop3-folder.c:188
+#: camel/providers/pop3/camel-pop3-folder.c:192
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:282
+#: camel/providers/pop3/camel-pop3-folder.c:285
 #, c-format
 msgid "No message with uid %s"
 msgstr "Nincs %s azonos�t�j� lev�l"
 
-#: camel/providers/pop3/camel-pop3-folder.c:286
+#: camel/providers/pop3/camel-pop3-folder.c:289
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "Lev�l lista rendez�se t�ma szerint"
 
-#: camel/providers/pop3/camel-pop3-folder.c:304
+#: camel/providers/pop3/camel-pop3-folder.c:307
 #, 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 "Lev�lt�rzs"
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+#, fuzzy
+msgid "Leave messages on server"
+msgstr "Kil�p�s a lev�lszerkeszt�b�l"
+
+#: camel/providers/pop3/camel-pop3-provider.c:41
+#, fuzzy, c-format
+msgid "Delete after %s day(s)"
+msgstr "A feladat t�rl�se"
+
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
 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."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54
-msgid "Secure POP"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:56
-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-store.c:147
+#: 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:157
+#: 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:169
+#: 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:214
+#: camel/providers/pop3/camel-pop3-store.c:207
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:331
+#: camel/providers/pop3/camel-pop3-store.c:319
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:378
+#: camel/providers/pop3/camel-pop3-store.c:358
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:377
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:400
-#: camel/providers/pop3/camel-pop3-store.c:437
+#: camel/providers/pop3/camel-pop3-store.c:380
+#: camel/providers/pop3/camel-pop3-store.c:417
 msgid "(Unknown)"
 msgstr "(Ismeretlen)"
 
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:407
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:415
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nincs '%s' mappa."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:57
 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 ""
 
-#: 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 "Lev�l �r�sa"
 
-#: 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
 #, fuzzy
 msgid "Could not find 'From' address in message"
 msgstr "Lev�l �r�sa"
 
-#: 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 ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
 msgid "SMTP"
 msgstr ""
 
-#: 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 ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:53
-msgid "Secure SMTP"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-provider.c:55
-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:147
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:175
 #, fuzzy
 msgid "Help message"
 msgstr "Lev�l _nyomtat�sa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:177
 #, fuzzy
 msgid "Service ready"
 msgstr "Rejt�s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:213
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Authentik�ci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:215
 #, fuzzy
 msgid "Authentication required"
 msgstr "Authentik�ci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:286
+#: camel/providers/smtp/camel-smtp-transport.c:305
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:348
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
+msgstr "Authentik�ci�:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:466
-#, fuzzy
-msgid "No authentication required"
-msgstr "Authentik�ci�:"
-
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/smtp/camel-smtp-transport.c:411
+#, c-format
 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."
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:511
+#: camel/providers/smtp/camel-smtp-transport.c:527
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "%s kiszolg�l� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:529
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:554
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:561
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:559
+#: camel/providers/smtp/camel-smtp-transport.c:575
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
-#: camel/providers/smtp/camel-smtp-transport.c:719
+#: camel/providers/smtp/camel-smtp-transport.c:721
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:736
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:777
+#: camel/providers/smtp/camel-smtp-transport.c:798
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:824
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:821
+#: camel/providers/smtp/camel-smtp-transport.c:843
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:846
+#: camel/providers/smtp/camel-smtp-transport.c:868
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:865
+#: camel/providers/smtp/camel-smtp-transport.c:887
 #, fuzzy, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Ismeretlen hiba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:896
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:915
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:930
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:952
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:967
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:1013
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1010
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Ismeretlen hiba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1033
+#: camel/providers/smtp/camel-smtp-transport.c:1055
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1052
+#: camel/providers/smtp/camel-smtp-transport.c:1074
 #, 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:95
 msgid "1 byte"
 msgstr "1 b�jt"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:97
 #, c-format
 msgid "%u bytes"
 msgstr "%u b�jt"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:112
 #, 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:113
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
 msgid "attachment"
 msgstr "csatol�s"
 
-#: composer/e-msg-composer-attachment-bar.c:413
+#: composer/e-msg-composer-attachment-bar.c:421
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "F�jl csatol�sa"
 
-#: composer/e-msg-composer-attachment-bar.c:461
+#: composer/e-msg-composer-attachment-bar.c:469
 msgid "Remove selected items from the attachment list"
 msgstr "T�rli a kiv�lasztott elemeket a csatol�si list�r�l"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Add attachment..."
 msgstr "Csatol..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:501
 msgid "Attach a file to the message"
 msgstr "Csatolj egy f�jlt a lev�lhez"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
-#: ui/evolution-mail.xml.h:1
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
 #, fuzzy
 msgid "Attachment"
 msgstr "csatol�s"
@@ -4510,52 +4836,52 @@ msgstr "MIME t�pus:"
 msgid "Send as:"
 msgstr "'%s' k�ld�se"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:321
 msgid "Click here for the address book"
 msgstr "C�mjegyz�kben val� keres�shez kattints ide"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
 msgid "From:"
 msgstr "Felad�:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
 msgid "Subject:"
 msgstr "T�ma:"
 
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
 msgid "To:"
 msgstr "To:"
 
-#: composer/e-msg-composer-hdrs.c:377
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Enter the recipients of the message"
 msgstr "�rd be a lev�l c�mzettj�t"
 
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:381
+#: composer/e-msg-composer-hdrs.c:388
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�rd be, kik kapjanak m�solatot a lev�lr�l"
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:392
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4563,33 +4889,39 @@ msgstr ""
 "�rd be azokat a c�meket, akik rejtett m�solatot kapnak a lev�lr�l, azaz a "
 "c�mzettn�l nem jelenik meg a c�m�k"
 
-#: composer/e-msg-composer.c:518
+#: composer/e-msg-composer.c:528
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:706
+#: composer/e-msg-composer.c:716
 msgid "Save as..."
 msgstr "Ment mint..."
 
-#: composer/e-msg-composer.c:717
+#: composer/e-msg-composer.c:727
 #, c-format
 msgid "Error saving file: %s"
 msgstr "F�jl ment�si hiba: %s"
 
-#: composer/e-msg-composer.c:737
+#: composer/e-msg-composer.c:747
 #, c-format
 msgid "Error loading file: %s"
 msgstr "F�jl bet�lt�si hiba: %s"
 
-#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
+#: composer/e-msg-composer.c:819
+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 "Evol�ci�"
 
-#: composer/e-msg-composer.c:824
+#: composer/e-msg-composer.c:883
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4599,27 +4931,27 @@ msgstr ""
 "\n"
 "Menteni akarod a v�ltoz�saidat?"
 
-#: composer/e-msg-composer.c:849
+#: composer/e-msg-composer.c:908
 msgid "Open file"
 msgstr "F�jl megnyit�s"
 
-#: composer/e-msg-composer.c:975
+#: composer/e-msg-composer.c:1034
 msgid "That file does not exist."
 msgstr "A f�jl nem l�tezik."
 
-#: composer/e-msg-composer.c:985
+#: composer/e-msg-composer.c:1044
 msgid "That is not a regular file."
 msgstr "Nem sima f�jl."
 
-#: composer/e-msg-composer.c:995
+#: composer/e-msg-composer.c:1054
 msgid "That file exists but is not readable."
 msgstr "Az a f�jl l�tezik, de nem olvashat�."
 
-#: composer/e-msg-composer.c:1005
+#: composer/e-msg-composer.c:1064
 msgid "That file appeared accesible but open(2) failed."
 msgstr "A f�jl el�rhet�nek l�tszik, de open(2) hiba t�rt�nt."
 
-#: composer/e-msg-composer.c:1027
+#: composer/e-msg-composer.c:1086
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4627,26 +4959,26 @@ msgstr ""
 "A f�jl t�l nagy (100K f�l�tti).\n"
 "T�nyleg be szeretn�d sz�rni?"
 
-#: composer/e-msg-composer.c:1048
+#: composer/e-msg-composer.c:1107
 msgid "An error occurred while reading the file."
 msgstr "Hiba t�rt�nt megnyit�s k�zben."
 
-#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
+#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
 msgid "Compose a message"
 msgstr "Lev�l �r�sa"
 
-#: composer/e-msg-composer.c:1765
+#: composer/e-msg-composer.c:1829
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: composer/evolution-composer.c:352
+#: 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:367
+#: composer/evolution-composer.c:370
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Nem tudom az Evol�ci� levelez� komponens�t elind�tani."
@@ -4667,55 +4999,81 @@ msgid "calendar information"
 msgstr "Nincs inform�ci�"
 
 #. 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:69 e-util/e-time-utils.c:117
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
 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:86 e-util/e-time-utils.c:197
+#: 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:89 e-util/e-time-utils.c:200
+#: 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:93 e-util/e-time-utils.c:204
+#: 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:96 e-util/e-time-utils.c:207
+#: 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:267
-#: 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:269
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
 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:272
+#: e-util/e-time-utils.c:274
 #, 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:281
+#: e-util/e-time-utils.c:283
 #, 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
 #, fuzzy
 msgid "Evolution component for the executive summary."
@@ -4796,7 +5154,7 @@ msgstr "K�vetkez� elemre ugr�s"
 msgid "Configure %s"
 msgstr "_Mappa be�ll�t�sa"
 
-#: executive-summary/component/e-summary.c:918
+#: executive-summary/component/e-summary.c:924
 #, fuzzy, c-format
 msgid ""
 "Cannot open the HTML file:\n"
@@ -4805,14 +5163,14 @@ msgstr ""
 "Nem tudom m�solni a f�jlokat\n"
 "'%s'-be."
 
-#: executive-summary/component/e-summary.c:932
+#: executive-summary/component/e-summary.c:938
 #, fuzzy, c-format
 msgid ""
 "Error reading data:\n"
 "%s"
 msgstr "F�jl bet�lt�si hiba: %s"
 
-#: executive-summary/component/e-summary.c:950
+#: executive-summary/component/e-summary.c:956
 msgid "File does not have a place for the services.\n"
 msgstr ""
 
@@ -4824,7 +5182,7 @@ msgstr ""
 msgid "Background:"
 msgstr ""
 
-#: executive-summary/component/main.c:60
+#: 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"
@@ -4858,102 +5216,102 @@ msgstr ""
 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
+#: 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 "Nincs hiba"
 
-#: executive-summary/test-service/rdf-summary.c:765
+#: executive-summary/test-service/rdf-summary.c:768
 msgid "Update automatically"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:775
+#: executive-summary/test-service/rdf-summary.c:778
 msgid "Update now"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:785
+#: executive-summary/test-service/rdf-summary.c:788
 #, fuzzy
 msgid "Update every "
 msgstr "_Szabad/foglalt friss�t�se"
 
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
+#: executive-summary/test-service/rdf-summary.c:796
+#: filter/filter-datespec.c:83
 msgid "minutes"
 msgstr "percek"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "year"
 msgstr "�v"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "years"
 msgstr "�vek"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "month"
 msgstr "h�nap"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "months"
 msgstr "h�napok"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "week"
 msgstr "h�t"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "weeks"
 msgstr "hetek"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:81
 msgid "days"
 msgstr "napok"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hour"
 msgstr "�ra"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hours"
 msgstr "�r�k"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:83
 msgid "minute"
 msgstr "perc"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "second"
 msgstr "m�sodperc"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "seconds"
 msgstr " m�sodpercek"
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:199
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:201
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:275
 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:298
 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:338
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -4961,126 +5319,103 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 #, fuzzy
 msgid "the current time"
 msgstr "Jelenid�re ugr�s"
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:374
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:432
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
 msgid "now"
 msgstr "most"
 
-#: filter/filter-datespec.c:690
+#: filter/filter-datespec.c:706
 msgid "<click here to select a date>"
 msgstr "<kattints ide a d�tum kiv�laszt�s�hoz>"
 
-#: filter/filter-editor.c:126 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "Sz�r� szab�lyok"
 
 #. and now for the action area
-#: filter/filter-filter.c:424
+#: filter/filter-filter.c:453
 msgid "Then"
 msgstr "Akkor"
 
-#: filter/filter-filter.c:437
+#: filter/filter-filter.c:467
 msgid "Add action"
 msgstr "M�velet hozz�ad�sa"
 
-#: 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."
 msgstr ""
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
+#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
+#: mail/mail-account-gui.c:682
 msgid "Select Folder"
 msgstr "V�lassz mapp�t"
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:247
 msgid "Enter folder URI"
 msgstr "�rj be egy mappa URI-t"
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:293
 msgid "<click here to select a folder>"
 msgstr "<kattints ide a mappa kiv�laszt�s�hoz>"
 
-#: filter/filter-input.c:189
+#: filter/filter-input.c:194
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:467
+#: filter/filter-part.c:475
 msgid "Test"
 msgstr "Teszt"
 
-#: filter/filter-rule.c:597
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Szab�ly neve:"
 
-#: filter/filter-rule.c:601
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "N�vtelen"
 
-#: filter/filter-rule.c:617
+#: filter/filter-rule.c:646
 msgid "If"
 msgstr "Ha"
 
-#: filter/filter-rule.c:634
+#: filter/filter-rule.c:664
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:638
+#: filter/filter-rule.c:668
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:643
+#: filter/filter-rule.c:673
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:654
+#: filter/filter-rule.c:684
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:660
-msgid "Remove criterion"
-msgstr ""
-
-#: filter/filter-system-flag.c:67
-#, fuzzy
-msgid "Replied to"
-msgstr "Mindenkinek"
-
-#. { N_("Deleted"), "Deleted" },
-#. { N_("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr ""
-
-#: filter/filter-system-flag.c:71
-#, fuzzy
-msgid "Read"
-msgstr "R�di�"
-
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Sz�r�k szerkeszt�se"
@@ -5098,7 +5433,7 @@ msgstr ""
 msgid "Outgoing"
 msgstr "K�rvonal:"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtu�lis Mapp�k"
 
@@ -5124,289 +5459,328 @@ msgstr ""
 msgid "with all local folders"
 msgstr "�j mappa k�sz�t�se"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Sz�n hozz�rendel�se"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Pontsz�m hozz�rendel�se"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 #, fuzzy
 msgid "Attachments"
 msgstr "csatol�s"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "tartalmaz"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Mapp�ba m�sol�s"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Fogad�s d�tuma"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "K�ld�s d�tuma"
 
-#: filter/libfilter-i18n.h:12
-msgid "does not contain"
-msgstr "nem tartalmaz"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not end with"
-msgstr "nincs a v�g�n"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not exist"
-msgstr "nem l�tezik"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not sound like"
-msgstr "nem �gy hangzik mint"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not start with"
-msgstr "nincs az elej�n"
+#: filter/libfilter-i18n.h:9
+#, fuzzy
+msgid "Deleted"
+msgstr "T�r�l"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:10
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "nem l�tezik"
 
-#: filter/libfilter-i18n.h:18
-msgid "ends with"
-msgstr "a v�g�n van"
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Draft"
+msgstr "Lej�rat"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Exist"
 msgstr "Szerkeszt"
 
-#: filter/libfilter-i18n.h:20
-msgid "exists"
-msgstr "l�tezik"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Kifejez�s"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Forward to Address"
 msgstr "A lev�l tov�bb�t�sa c�mre"
 
-#: filter/libfilter-i18n.h:23
-msgid "is"
-msgstr "egy"
-
-#: filter/libfilter-i18n.h:24
-msgid "is greater than"
-msgstr "nagyobb mint"
-
-#: filter/libfilter-i18n.h:25
-msgid "is less than"
-msgstr "kisebb mint"
+#: filter/libfilter-i18n.h:15
+msgid "Important"
+msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "is not"
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "Is Not"
 msgstr "nem egy"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Is"
+msgstr "Ha"
+
+#: filter/libfilter-i18n.h:18
 #, fuzzy
 msgid "Mailing list"
 msgstr "%s levelez�lista"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:19
 msgid "Message Body"
 msgstr "Lev�lt�rzs"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:20
 #, fuzzy
 msgid "Message Header"
 msgstr "Lev�lt�rzs"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:21
 msgid "Message was received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:22
 msgid "Message was sent"
 msgstr "A lev�l el lett k�ldve"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:23
 msgid "Move to Folder"
 msgstr "Mapp�ba mozgat"
 
-#: filter/libfilter-i18n.h:33
-msgid "on or after"
-msgstr "akkor vagy ut�n volt"
-
-#: filter/libfilter-i18n.h:34
-msgid "on or before"
-msgstr "akkor vagy el�bb"
+#: filter/libfilter-i18n.h:24
+#, fuzzy
+msgid "Read"
+msgstr "R�di�"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:25
 msgid "Recipients"
 msgstr "C�mzettek"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:26
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1171
+#: filter/libfilter-i18n.h:27
+#, fuzzy
+msgid "Replied to"
+msgstr "Mindenkinek"
+
+#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
+#: mail/message-list.c:1052
 msgid "Score"
 msgstr "Pontsz�m"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:29
+msgid "Sender"
+msgstr "Felad�"
+
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "Set Status"
 msgstr "_St�tusz:"
 
-#: filter/libfilter-i18n.h:40
-msgid "sounds like"
-msgstr "�gy hangzik, mint"
-
-#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
-msgid "Source"
-msgstr "Forr�s"
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "Source Account"
+msgstr "Email tartalmaz"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:32
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
-msgid "starts with"
-msgstr "�gy kezd�dik:"
-
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:34
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
+#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
 msgid "Subject"
 msgstr "T�ma"
 
+#: filter/libfilter-i18n.h:38
+msgid "contains"
+msgstr "tartalmaz"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not contain"
+msgstr "nem tartalmaz"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not end with"
+msgstr "nincs a v�g�n"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not exist"
+msgstr "nem l�tezik"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not sound like"
+msgstr "nem �gy hangzik mint"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not start with"
+msgstr "nincs az elej�n"
+
+#: filter/libfilter-i18n.h:44
+msgid "ends with"
+msgstr "a v�g�n van"
+
+#: filter/libfilter-i18n.h:45
+msgid "exists"
+msgstr "l�tezik"
+
+#: filter/libfilter-i18n.h:46
+msgid "is greater than"
+msgstr "nagyobb mint"
+
 #: filter/libfilter-i18n.h:47
+msgid "is less than"
+msgstr "kisebb mint"
+
+#: filter/libfilter-i18n.h:48
+msgid "is not"
+msgstr "nem egy"
+
+#: filter/libfilter-i18n.h:49
+msgid "is"
+msgstr "egy"
+
+#: filter/libfilter-i18n.h:50
+msgid "on or after"
+msgstr "akkor vagy ut�n volt"
+
+#: filter/libfilter-i18n.h:51
+msgid "on or before"
+msgstr "akkor vagy el�bb"
+
+#: filter/libfilter-i18n.h:52
+msgid "sounds like"
+msgstr "�gy hangzik, mint"
+
+#: filter/libfilter-i18n.h:53
+msgid "starts with"
+msgstr "�gy kezd�dik:"
+
+#: filter/libfilter-i18n.h:54
 msgid "was after"
 msgstr "ut�n volt"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:55
 msgid "was before"
 msgstr "el�tte volt"
 
-#: filter/score-editor.c:126
+#: filter/score-editor.c:130
 #, fuzzy
 msgid "Score Rules"
 msgstr "Pontsz�m szab�ly szerkeszt�se"
 
-#: mail/component-factory.c:306
+#: mail/component-factory.c:329
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nem tudom az Evol�ci� levelez� komponens�t elind�tani."
 
-#: mail/component-factory.c:379
+#: mail/component-factory.c:402
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:237
+#: mail/folder-browser-factory.c:209
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "�breszt� be�ll�t�sok"
 
-#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 #, fuzzy
 msgid "Properties"
 msgstr "�breszt� be�ll�t�sok"
 
-#: mail/folder-browser.c:219
+#: mail/folder-browser.c:225
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "V�lassz mapp�t"
 
-#: mail/folder-browser.c:509
+#: mail/folder-browser.c:533
 msgid "VFolder on Subject"
 msgstr "VMappa a t�m�ra"
 
-#: mail/folder-browser.c:512
+#: mail/folder-browser.c:536
 msgid "VFolder on Sender"
 msgstr "VMappa a felad�ra"
 
-#: mail/folder-browser.c:515
+#: mail/folder-browser.c:539
 msgid "VFolder on Recipients"
 msgstr "VMappa a c�mzettekre"
 
-#: mail/folder-browser.c:518 mail/folder-browser.c:702
+#: mail/folder-browser.c:542 mail/folder-browser.c:733
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Sz�r� a levelez�si list�ra"
 
-#: mail/folder-browser.c:524
+#: mail/folder-browser.c:548
 msgid "Filter on Subject"
 msgstr "Sz�r� a t�m�ra"
 
-#: mail/folder-browser.c:527
+#: mail/folder-browser.c:551
 msgid "Filter on Sender"
 msgstr "Sz�r� a felad�n"
 
-#: mail/folder-browser.c:530
+#: mail/folder-browser.c:554
 msgid "Filter on Recipients"
 msgstr "Sz�r� a c�mzettekre"
 
-#: mail/folder-browser.c:533 mail/folder-browser.c:701
+#: mail/folder-browser.c:557 mail/folder-browser.c:732
 msgid "Filter on Mailing List"
 msgstr "Sz�r� a levelez�si list�ra"
 
-#: mail/folder-browser.c:544
+#: mail/folder-browser.c:568
+#, fuzzy
+msgid "Resend"
+msgstr "m�sodperc"
+
+#: mail/folder-browser.c:570
 #, fuzzy
 msgid "Save As..."
 msgstr "Ment mint..."
 
-#: mail/folder-browser.c:546 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Nyomtat"
-
-#: mail/folder-browser.c:551
+#: mail/folder-browser.c:577
 #, fuzzy
 msgid "Reply to Sender"
 msgstr "Mindenkinek"
 
-#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
+#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
 msgid "Reply to All"
 msgstr "Mindenkinek"
 
-#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
+#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
 msgid "Forward"
 msgstr "Tov�bb�t"
 
-#: mail/folder-browser.c:557
+#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
 #, fuzzy
 msgid "Forward inline"
 msgstr "Tov�bb�t"
 
-#: mail/folder-browser.c:560
+#: mail/folder-browser.c:586
 msgid "Mark as Read"
 msgstr "Jel�l�s olvasottnak"
 
-#: mail/folder-browser.c:562
+#: mail/folder-browser.c:588
 msgid "Mark as Unread"
 msgstr "Jel�l�s nem olvasottnak"
 
-#: mail/folder-browser.c:567
+#: mail/folder-browser.c:593
 msgid "Move to Folder..."
 msgstr "Mapp�ba mozgat�s..."
 
-#: mail/folder-browser.c:569
+#: mail/folder-browser.c:595
 msgid "Copy to Folder..."
 msgstr "Mapp�ba m�sol�s..."
 
-#: mail/folder-browser.c:573
+#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
 msgid "Undelete"
 msgstr "Vissza�ll�t"
 
@@ -5414,20 +5788,20 @@ msgstr "Vissza�ll�t"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:583
+#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
 msgid "Apply Filters"
 msgstr "Sz�r�k alkalmaz�sa"
 
-#: mail/folder-browser.c:587
+#: mail/folder-browser.c:613
 msgid "Create Rule From Message"
 msgstr "A lev�lb�l gy�rts szab�lyt"
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:735
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Sz�r� a levelez� list�ra (%s)"
 
-#: mail/folder-browser.c:705
+#: mail/folder-browser.c:736
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Sz�r� a levelez� list�ra (%s)"
@@ -5507,19 +5881,28 @@ msgstr ""
 msgid "mh"
 msgstr "h"
 
-#: mail/mail-accounts.c:116
+#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
 #, fuzzy
 msgid " (default)"
 msgstr "Alap�rtelmezett"
 
-#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#: mail/mail-accounts.c:197
+#, fuzzy
+msgid "Disable"
+msgstr "Tilt�s."
+
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+msgid "Enable"
+msgstr ""
+
+#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 "T�nyleg t�r�lni akarod\n"
 "ezt a n�vjegyet?"
 
-#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
@@ -5527,51 +5910,45 @@ msgstr ""
 "ezt a n�vjegyet?"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:423
+#: mail/mail-accounts.c:536
 msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/mail-account-editor.c:307
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
+#: 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:706
+#: mail/mail-account-editor.c:173
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Evol�ci� tennival� csatorna"
 
-#: mail/mail-account-editor.c:727
-msgid "Unspecified"
-msgstr ""
-
-#: mail/mail-autofilter.c:71
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Lev�l %s-nek"
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, c-format
 msgid "Subject is %s"
 msgstr "A t�ma %s"
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr "Lev�l %s-t�l"
 
-#: mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr "%s levelez�lista"
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
 msgid "Add Filter Rule"
 msgstr "Sz�r� szab�ly hozz�ad�sa"
 
-#: mail/mail-callbacks.c:85
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5579,7 +5956,7 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:146
 #, fuzzy
 msgid ""
 "You need to configure an identity\n"
@@ -5588,7 +5965,7 @@ msgstr ""
 "Egy azonos�t�t be kell �ll�tanod\n"
 "miel�tt levelet k�ldessz."
 
-#: mail/mail-callbacks.c:150
+#: mail/mail-callbacks.c:158
 #, fuzzy
 msgid ""
 "You need to configure a mail transport\n"
@@ -5597,11 +5974,11 @@ msgstr ""
 "Egy azonos�t�t be kell �ll�tanod\n"
 "miel�tt levelet k�ldessz."
 
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:202
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:227
+#: mail/mail-callbacks.c:235
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5609,118 +5986,134 @@ msgstr ""
 "Nincs t�rgya a lev�lnek.\n"
 "T�nyleg elk�ldjem?"
 
-#: mail/mail-callbacks.c:294
+#: mail/mail-callbacks.c:308
+msgid "You must specify recipients in order to send this message."
+msgstr ""
+
+#: mail/mail-callbacks.c:351
 #, fuzzy
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "Egy azonos�t�t be kell �ll�tanod\n"
 "miel�tt levelet k�ldessz."
 
-#: mail/mail-callbacks.c:316
-msgid "You must specify recipients in order to send this message."
-msgstr ""
-
-#: mail/mail-callbacks.c:579
+#: mail/mail-callbacks.c:591
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:761
+#: mail/mail-callbacks.c:773
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Forwarded message - %s"
 
-#: mail/mail-callbacks.c:864
+#: mail/mail-callbacks.c:876
 msgid "Move message(s) to"
 msgstr "Lev�l(levelek) mozgat�sa m�s mapp�ba"
 
-#: mail/mail-callbacks.c:866
+#: mail/mail-callbacks.c:878
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "Lev�l(levelek) mozgat�sa m�s mapp�ba"
 
-#: mail/mail-callbacks.c:1007
+#: mail/mail-callbacks.c:1019
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1056
+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?"
 msgstr "Fel�l�rod a f�jlt?"
 
-#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
 #, fuzzy
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr "A megadott n�ven m�r l�tezik mappa"
 
-#: mail/mail-callbacks.c:1088
+#: mail/mail-callbacks.c:1137
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Ment mint..."
 
-#: mail/mail-callbacks.c:1090
+#: mail/mail-callbacks.c:1139
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Ment mint..."
 
-#: mail/mail-callbacks.c:1204
+#: mail/mail-callbacks.c:1253
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "F�jl bet�lt�si hiba: %s"
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
 #, fuzzy
 msgid "Print Message"
 msgstr "Lev�l _nyomtat�sa"
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1349
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "Lev�l _nyomtat�sa"
 
+#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#, fuzzy
+msgid "Connecting to server..."
+msgstr "Nem tudom elind�tani a wombat kiszolg�l�t"
+
 #: mail/mail-config.glade.h:1
 #, fuzzy
+msgid " Check for supported types "
+msgstr "T�mogatott t�pusok detekt�l�sa..."
+
+#: mail/mail-config.glade.h:2
+#, fuzzy
+msgid " color"
+msgstr "Sz�nek"
+
+#: mail/mail-config.glade.h:3
+#, fuzzy
 msgid "Account"
 msgstr "Email tartalmaz"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "Account Information"
 msgstr "Nincs inform�ci�"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
-msgid "Advanced"
-msgstr "Halad�..."
+msgid "Accounts"
+msgstr "Email tartalmaz"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "Authentication"
 msgstr "Authentik�ci�:"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 #, fuzzy
-msgid "Authentication Type:"
+msgid "Authentication Type: "
 msgstr "Authentik�ci�:"
 
-#: mail/mail-config.glade.h:9
-msgid "Automatically check mail every"
+#: mail/mail-config.glade.h:10
+msgid "Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-#, fuzzy
-msgid "Check settings"
-msgstr "Be�ll�t�sok tesztel�se"
-
 #: mail/mail-config.glade.h:12
 #, fuzzy
 msgid ""
@@ -5734,277 +6127,244 @@ msgstr ""
 "A levelez�si be�ll�t�sod most teljes.\n"
 "Kattints a 'Befejez' gombra a ment�shez"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "De_fault"
 msgstr "Alap�rtelmezett"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Done"
 msgstr "Semmi"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:21
 #, fuzzy
-msgid "Email Address:"
-msgstr "Email c�m:"
+msgid "Drafts"
+msgstr "Lej�rat"
 
-#: mail/mail-config.glade.h:24
-msgid "Email address:"
-msgstr "Email c�m:"
+#: mail/mail-config.glade.h:22
+#, fuzzy
+msgid "Drafts folder:"
+msgstr "�j mappa k�sz�t�se"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
-msgid "Evolution Mail Configuration"
-msgstr "Levelez�s be�ll�t�sa"
+msgid "Email Address:"
+msgstr "Email c�m:"
 
 #: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "Full Name:"
 msgstr "Teljes n�v:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 #, fuzzy
-msgid "Hostname:"
-msgstr "Felhaszn�l�ln�v:"
+msgid "Highlight citations with "
+msgstr "A ma lej�r� elemek kivil�g�t�sa"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
-msgid "IMAP"
+msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Identity"
 msgstr "Azonos�t�"
 
-#: mail/mail-config.glade.h:32
-msgid "Include this account when receiving mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:33
-#, fuzzy
-msgid "Keep mail on server"
-msgstr "Kil�p�s a lev�lszerkeszt�b�l"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 #, fuzzy
-msgid "Kerberos"
+msgid "Kerberos "
 msgstr "Kerberos 4"
 
-#: mail/mail-config.glade.h:35
-#, fuzzy
-msgid "Mail"
-msgstr "_Lev�l"
-
-#: mail/mail-config.glade.h:36
-#, fuzzy
-msgid "Mail Account"
-msgstr "Email tartalmaz"
-
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:32
 msgid "Mail Configuration"
 msgstr "Levelez�s be�ll�t�sa"
 
-#: mail/mail-config.glade.h:38
-#, fuzzy
-msgid "Mail Configuration Druid"
-msgstr "Levelez�s be�ll�t�sa"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid "Mark messages as \"Read\" after:"
 msgstr "_Minden olvasott lev�l kijel�l�se"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "News"
 msgstr "�j..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:38
 #, fuzzy
-msgid "Optional"
-msgstr "Be�ll�t�sok"
+msgid "Optional Information"
+msgstr "Nincs inform�ci�"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:39
 msgid "Organization:"
 msgstr "Szervezet:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:41
 msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:46
 #, fuzzy
-msgid "Password:"
-msgstr "Jelsz�"
-
-#: mail/mail-config.glade.h:50
-msgid "Plain Text"
-msgstr ""
+msgid "Qmail maildir "
+msgstr "2. email"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:48
 #, fuzzy
-msgid "Remember my password"
-msgstr "VCard-k�nt ment�s"
+msgid "Receiving Mail"
+msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:49
 #, fuzzy
-msgid "Reply address:"
-msgstr "Email c�m:"
+msgid "Receiving Options"
+msgstr "Fogad�s d�tuma"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Required Information"
+msgstr "Nincs inform�ci�"
+
+#: mail/mail-config.glade.h:53
+msgid "Select PGP binary"
+msgstr ""
 
 #: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "Required"
-msgstr "_A k�rt emberek"
+msgid "Send mail in HTML format by default."
+msgstr "A levelet HTML form�tumban k�ldd"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Save password"
-msgstr "VCard-k�nt ment�s"
+msgid "Sending Email"
+msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:57
-msgid "Select PGP binary"
-msgstr ""
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Sendmail"
 
 #: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Select signature file"
-msgstr "Al��r�s f�jl:"
+msgid "Sent"
+msgstr "N�zett"
 
 #: mail/mail-config.glade.h:59
 #, fuzzy
-msgid "Send mail in HTML format by default."
-msgstr "A levelet HTML form�tumban k�ldd"
+msgid "Sent and Draft Messages"
+msgstr "Napt�r"
 
 #: mail/mail-config.glade.h:60
 #, fuzzy
-msgid "Sending Email"
-msgstr "Sendmail"
+msgid "Sent messages folder:"
+msgstr "Lev�l mozgat�sa m�s mapp�ba"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Levelez�s be�ll�t�sa"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Server Type: "
 msgstr "Szerver:"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
-#, fuzzy
-msgid "Server type:"
-msgstr "Szerver:"
-
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Signature file:"
 msgstr "Al��r�s f�jl:"
 
-#: mail/mail-config.glade.h:67
-#, fuzzy
-msgid "Signature:"
-msgstr "Al��r�s f�jl:"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:65
 msgid "Sources"
 msgstr "Forr�sok"
 
-#: mail/mail-config.glade.h:70
-msgid "This server requires a secure connection (SSL)"
-msgstr ""
-
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:66
 #, fuzzy
-msgid "Transport"
-msgstr "�ttetsz�"
+msgid "Special Folders"
+msgstr "Virtu�lis Mapp�k"
 
-#: mail/mail-config.glade.h:72
-#, fuzzy
-msgid "Transport Authentication"
-msgstr "Authentik�ci�:"
+#: mail/mail-config.glade.h:67
+msgid "Standard Unix mbox"
+msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Type"
 msgstr "T�pus"
 
-#: mail/mail-config.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
+#: mail/mail-config.glade.h:69
+msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
-#, fuzzy
-msgid "User Information"
-msgstr "Nincs inform�ci�"
-
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:70
 msgid "Username:"
 msgstr "Felhaszn�l�ln�v:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:71
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: 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:28
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
 #, fuzzy
 msgid "_Edit"
 msgstr "Szerkeszt"
 
-#: mail/mail-config.glade.h:83
-#, fuzzy
-msgid "minutes."
-msgstr "percek"
+#: 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:421
-#, c-format
+#: mail/mail-config-druid.c:101
 msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+"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:515
-#, fuzzy
-msgid "Namespace:"
-msgstr "N�v:"
+#: 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:708
-#, c-format
+#: mail/mail-config-druid.c:107
 msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+"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:1215
+#: mail/mail-config-druid.c:445
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-display.c:189
+#: mail/mail-display.c:194
 #, fuzzy
 msgid "Save Attachment"
 msgstr "FIXME: Csatol�sok me_nt�se..."
 
-#: mail/mail-display.c:229
+#: mail/mail-display.c:234
 #, fuzzy, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -6012,564 +6372,562 @@ msgstr ""
 "%s\n"
 "Hiba: %s"
 
-#: mail/mail-display.c:290
+#: mail/mail-display.c:295
 #, fuzzy
 msgid "Save to Disk..."
 msgstr "Ment mint..."
 
-#: mail/mail-display.c:292
+#: mail/mail-display.c:297
 #, fuzzy, c-format
 msgid "Open in %s..."
 msgstr "Megnyit..."
 
-#: mail/mail-display.c:294
+#: mail/mail-display.c:299
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:323
+#: mail/mail-display.c:334
 #, fuzzy
 msgid "External Viewer"
 msgstr "K�ls� k�nyvt�rak"
 
-#: mail/mail-display.c:346
+#: mail/mail-display.c:357
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:361
 msgid "Hide"
 msgstr "Rejt�s"
 
-#: mail/mail-format.c:506
+#: mail/mail-display.c:1102
+msgid "Open link in browser"
+msgstr ""
+
+#: mail/mail-display.c:1104
+#, fuzzy
+msgid "Save as (FIXME)"
+msgstr "N�vjegy szerkeszt�"
+
+#: mail/mail-display.c:1106
+#, fuzzy
+msgid "Copy location (FIXME)"
+msgstr "N�vjegy szerkeszt�"
+
+#: mail/mail-format.c:518
 #, c-format
 msgid "%s attachment"
 msgstr "%s csatol�s"
 
-#: mail/mail-format.c:704
+#: mail/mail-format.c:560
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+
+#: mail/mail-format.c:742
 #, fuzzy
 msgid "Loading message content"
 msgstr "A lev�l tov�bb�t�sa"
 
-#: mail/mail-format.c:993
+#: mail/mail-format.c:1046
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Hib�s �zenet az felad� threadt�l?"
 
-#: mail/mail-format.c:999
+#: mail/mail-format.c:1052
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Lev�l elk�ld�se"
 
-#: mail/mail-format.c:1000
+#: mail/mail-format.c:1053
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1069 mail/mail-format.c:1456
+#: mail/mail-format.c:1137 mail/mail-format.c:1526
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1077 mail/mail-format.c:1464
+#: mail/mail-format.c:1145 mail/mail-format.c:1534
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1677
+#: mail/mail-format.c:1747
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1689
+#: mail/mail-format.c:1759
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1693
+#: mail/mail-format.c:1763
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1727
+#: mail/mail-format.c:1797
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1732
+#: mail/mail-format.c:1802
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:335
+#: mail/mail-local.c:337
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Nincs '%s' mappa."
 
-#: mail/mail-local.c:508
+#: mail/mail-local.c:509
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "Megnyit..."
 
-#: mail/mail-local.c:786
+#: mail/mail-local.c:787
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:790
+#: mail/mail-local.c:791
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:815
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Mappa be�ll�t�sa"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:843
+#: mail/mail-local.c:844
 #, fuzzy
 msgid "Closing current folder"
 msgstr "_Mappa be�ll�t�sa"
 
-#: mail/mail-local.c:875
+#: mail/mail-local.c:876
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:893
+#: mail/mail-local.c:894
 #, fuzzy
 msgid "Creating new folder"
 msgstr "�j mappa k�sz�t�se"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:908
 #, fuzzy
 msgid "Copying messages"
 msgstr "Lev�l �r�sa"
 
-#: mail/mail-local.c:928
+#: mail/mail-local.c:925
 #, 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:964
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:177
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:179
+#: mail/mail-mt.c:192
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr "F�jl bet�lt�si hiba: %s"
 
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
+#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
 #, fuzzy
 msgid "Working"
 msgstr "Mozgat�s alatt"
 
-#: mail/mail-mt.c:666 mail/session.c:91
+#: mail/mail-mt.c:679 mail/session.c:98
 msgid "Do you accept?"
 msgstr ""
 
-#: mail/mail-mt.c:860
+#: mail/mail-mt.c:873
 #, fuzzy
 msgid "Evolution progress"
 msgstr "Evol�ci�"
 
-#: mail/mail-ops.c:516
+#: mail/mail-ops.c:587
 #, c-format
 msgid "Sending \"%s\""
 msgstr "'%s' k�ld�s alatt"
 
-#: mail/mail-ops.c:518
+#: mail/mail-ops.c:589
 #, fuzzy
 msgid "Sending message"
 msgstr "A lev�l t�rl�se"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:704
+#, fuzzy, c-format
+msgid "Sending message %d of %d"
+msgstr "A lev�l t�rl�se"
+
+#: mail/mail-ops.c:723
+#, fuzzy, c-format
+msgid "Failed on message %d of %d"
+msgstr "Lev�l mozgat�sa m�s mapp�ba"
+
+#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#, fuzzy
+msgid "Complete."
+msgstr "% k�sz:"
+
+#: mail/mail-ops.c:811
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Lev�l mozgat�sa m�s mapp�ba"
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Lev�l(levelek) mozgat�sa m�s mapp�ba"
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Lev�l �r�sa"
 
-#: mail/mail-ops.c:842
+#: mail/mail-ops.c:900
 msgid "Moving"
 msgstr "Mozgat�s alatt"
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:903
 msgid "Copying"
 msgstr "M�sol�s alatt"
 
-#: mail/mail-ops.c:856
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:978
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1085
+#: mail/mail-ops.c:1139
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Forwarded message - %s"
 
-#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
+#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Nem tudom be�ll�tani a helyi t�rter�letet -- %s"
 
-#: mail/mail-ops.c:1193
+#: mail/mail-ops.c:1247
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Nem tudom be�ll�tani a helyi t�rter�letet -- %s"
 
-#: mail/mail-ops.c:1380
+#: mail/mail-ops.c:1434
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1429
+#: mail/mail-ops.c:1483
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Lev�l lista rendez�se t�ma szerint"
 
-#: mail/mail-ops.c:1496
+#: mail/mail-ops.c:1550
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Lev�l �r�sa"
 
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1560
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1580
+#: mail/mail-ops.c:1634
 #, fuzzy
 msgid "Saving messages"
 msgstr "Lev�l �r�sa"
 
-#: mail/mail-ops.c:1659
+#: mail/mail-ops.c:1713
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: mail/mail-ops.c:1672
+#: mail/mail-ops.c:1726
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Lev�l mozgat�sa m�s mapp�ba"
 
-#: mail/mail-ops.c:1686
+#: mail/mail-ops.c:1740
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "F�jl ment�si hiba: %s"
 
-#: mail/mail-ops.c:1760
+#: mail/mail-ops.c:1814
 #, fuzzy
 msgid "Saving attachment"
 msgstr "FIXME: Csatol�sok me_nt�se..."
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1829
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1857
 #, fuzzy, c-format
 msgid "Could not write data: %s"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: mail/mail-search-dialogue.c:107
+#: mail/mail-search-dialogue.c:113
 #, fuzzy
 msgid "_Search"
 msgstr "Keres�s"
 
-#: mail/mail-send-recv.c:136
+#: mail/mail-send-recv.c:138
 #, fuzzy
 msgid "Cancelling ..."
 msgstr "M�gsem"
 
-#: mail/mail-send-recv.c:231
+#: mail/mail-send-recv.c:233
 #, fuzzy
 msgid "Send & Receive mail"
 msgstr "Sendmail"
 
-#: mail/mail-send-recv.c:234
+#: mail/mail-send-recv.c:236
 #, fuzzy
 msgid "Receiving"
 msgstr "Fogad�s d�tuma"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:285
 msgid "Updating ..."
 msgstr ""
 
-#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+#: 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:306
 #, fuzzy
 msgid "Sending"
 msgstr "'%s' k�ld�s alatt"
 
-#: mail/mail-send-recv.c:469
+#: mail/mail-send-recv.c:471
 #, fuzzy
 msgid "Cancelled."
 msgstr "M�gsem"
 
-#: mail/mail-send-recv.c:473
-#, fuzzy
-msgid "Complete."
-msgstr "% k�sz:"
-
-#: mail/mail-summary.c:111
+#: mail/mail-summary.c:109
 msgid "Incomplete message written on pipe!"
 msgstr "Nem teljes �zenet lett a cs�be �rva!"
 
-#: mail/mail-tools.c:138
+#: mail/mail-tools.c:141
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:185
+#: mail/mail-tools.c:188
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (forwarded message)"
 
-#: mail/mail-tools.c:195
+#: mail/mail-tools.c:198
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (no subject)"
 
-#: mail/mail-tools.c:212
+#: mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Forwarded message - %s"
 
-#: mail/mail-tools.c:214
+#: mail/mail-tools.c:217
 msgid "Forwarded message (no subject)"
 msgstr "Forwarded message (no subject)"
 
-#: mail/mail-tools.c:411
+#: 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-vfolder.c:248
+#: mail/mail-vfolder.c:249
 msgid "VFolders"
 msgstr "VMapp�k"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:427
 msgid "New VFolder"
 msgstr "�j VMappa"
 
 #. 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:38
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
 msgid "Reply"
 msgstr "V�lasz"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
 msgid "Reply to the sender of this message"
 msgstr "V�lasz k�ld�se a felad�nak erre a lev�lre"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
 msgid "Reply to all recipients of this message"
 msgstr "V�lasz a felad�nak �s az �sszes c�mzettnek"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
 msgid "Forward this message"
 msgstr "A lev�l tov�bb�t�sa"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
+#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
 msgid "Print the selected message"
 msgstr "A lev�l nyomtat�sa"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "A lev�l t�rl�se"
 
-#: mail/message-list.c:618
+#: mail/message-list.c:648
 msgid "Unseen"
 msgstr "Nem n�zett"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:649
 msgid "Seen"
 msgstr "N�zett"
 
-#: mail/message-list.c:624
+#: mail/message-list.c:650
 msgid "Answered"
 msgstr "Megv�laszolt"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:651
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "Lev�l �r�sa"
 
-#: mail/message-list.c:630
+#: mail/message-list.c:652
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Lev�l _nyomtat�sa"
 
-#: mail/message-list.c:952
-#, c-format
-msgid "[ %s ]"
-msgstr ""
+#: mail/message-list.c:656
+#, fuzzy
+msgid "Lowest"
+msgstr "Alacsony"
 
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:964 mail/message-list.c:980
-#, c-format
-msgid "%s, et al."
-msgstr ""
+#: mail/message-list.c:657
+#, fuzzy
+msgid "Lower"
+msgstr "Alacsony"
 
-#: mail/message-list.c:967 mail/message-list.c:983
+#: mail/message-list.c:661
 #, fuzzy
-msgid "<unknown>"
-msgstr "Ismeretlen"
+msgid "Higher"
+msgstr "Magas"
+
+#: mail/message-list.c:662
+#, fuzzy
+msgid "Highest"
+msgstr "Magas"
 
-#: mail/message-list.c:1035
+#: mail/message-list.c:912
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1042
+#: mail/message-list.c:919
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1051
+#: mail/message-list.c:928
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1063
+#: mail/message-list.c:940
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1071
+#: mail/message-list.c:948
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1073
+#: mail/message-list.c:950
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:1171
+#: mail/message-list.c:1052
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "From"
 msgstr "Felad�:"
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "Date"
 msgstr "Lej�rat"
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "Received"
 msgstr "Fogad�s d�tuma"
 
-#: mail/message-list.c:1173
+#: mail/message-list.c:1054
 #, fuzzy
 msgid "To"
 msgstr "To:"
 
-#: mail/message-list.c:1173
+#: mail/message-list.c:1054
 #, fuzzy
 msgid "Size"
 msgstr "M�ret:"
 
-#: mail/openpgp-utils.c:89
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:92
-#, c-format
-msgid "Please enter your %s passphrase"
-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 "Nincs el�rhet� GPG/PGP program."
-
-#: 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 ""
-
-#: 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"
-msgstr "Nem siker�lt cs�vezet�ket l�trehozni a GPG/PGP-hez: %s"
-
-#: mail/openpgp-utils.c:588
-msgid "No recipients specified"
-msgstr ""
-
-#: mail/openpgp-utils.c:1088
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr ""
-
-#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
 #, fuzzy
 msgid "Folder"
 msgstr "Mapp�k"
 
-#: mail/subscribe-dialog.c:65
+#: mail/subscribe-dialog.c:77
 #, fuzzy
 msgid "Store"
 msgstr "Pontsz�m"
 
-#: mail/subscribe-dialog.c:147
+#: mail/subscribe-dialog.c:138
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:177
+#: mail/subscribe-dialog.c:168
 #, fuzzy, c-format
 msgid "Getting store for \"%s\""
 msgstr "_Indul�shoz"
 
-#: mail/subscribe-dialog.c:280
+#: mail/subscribe-dialog.c:271
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:273
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Nem tudom be�ll�tani a helyi t�rter�letet -- %s"
 
+#. Construct the app
+#: mail/subscribe-dialog.c:873
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Le�r�s:"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #, fuzzy
 msgid "Folder name:"
@@ -6585,9 +6943,18 @@ msgstr "Mapp�k"
 msgid "Specify where to create the folder:"
 msgstr "Nincs el�g hely a mappa elk�sz�t�s�hez"
 
+#: 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:157
+#: shell/importer/importer.c:182
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6595,77 +6962,73 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/importer/importer.c:175 shell/importer/importer.c:202
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/importer/importer.c:309
+#: shell/importer/importer.c:341
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/importer/importer.c:319
+#: shell/importer/importer.c:351
 #, fuzzy
 msgid "Importing"
 msgstr "Mozgat�s alatt"
 
-#: shell/importer/importer.c:327
+#: shell/importer/importer.c:359
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/importer/importer.c:342
+#: shell/importer/importer.c:372
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "F�jl bet�lt�si hiba: %s"
+
+#: shell/importer/importer.c:387
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "F�jl bet�lt�si hiba: %s"
 
-#: shell/importer/importer.c:357
+#: shell/importer/importer.c:402
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/importer/importer.c:428
+#: shell/importer/importer.c:473
 #, fuzzy
 msgid "Automatic"
 msgstr "_Automatikus kiszed�s"
 
-#: shell/importer/importer.c:478
+#: shell/importer/importer.c:523
 #, fuzzy
 msgid "Filename:"
 msgstr "F�jln�v:"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
 #, fuzzy
 msgid "Select a file"
 msgstr "Al��r�s f�jl:"
 
-#: shell/importer/importer.c:493
+#: shell/importer/importer.c:538
 #, fuzzy
 msgid "File type:"
 msgstr "F�jln�v:"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
 msgid "Import"
 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."
-msgstr ""
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -6687,44 +7050,44 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: shell/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr "Evol�ci� telep�t�s"
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:122
 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:123
 #, fuzzy
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "K�rlek nyomd meg az 'OK' gombot az Evol�ci� felhaszn�l�i f�jljainak "
 "telep�t�s�hez"
 
-#: shell/e-setup.c:157
+#: shell/e-setup.c:163
 #, fuzzy
 msgid "Could not update files correctly"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
+#: shell/e-setup.c:166 shell/e-setup.c:234
 msgid "Evolution files successfully installed."
 msgstr "Az Evol�ci� f�jljai sikeresen telep�ltek."
 
-#: shell/e-setup.c:189
+#: shell/e-setup.c:195
 #, fuzzy
 msgid "This seems to be the first time you are running Evolution."
 msgstr "�gy l�tszik, els� alkalommal futtatod az Evol�ci�t."
 
-#: shell/e-setup.c:190
+#: shell/e-setup.c:196
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "K�rlek nyomd meg az 'OK' gombot az Evol�ci� felhaszn�l�i f�jljainak "
 "telep�t�s�hez"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:215
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6735,7 +7098,7 @@ msgstr ""
 "%s\n"
 "Hiba: %s"
 
-#: shell/e-setup.c:224
+#: shell/e-setup.c:230
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -6744,7 +7107,7 @@ msgstr ""
 "Nem tudom m�solni a f�jlokat\n"
 "'%s'-be."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:255
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6755,7 +7118,7 @@ msgstr ""
 "K�rlek mozgasd el a f�jlt hogy az Evol�ci�\n"
 "telep�lni tudjon."
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:267
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6766,7 +7129,7 @@ msgstr ""
 "K�rlek t�r�ld a f�jlt hogy az Evol�ci�\n"
 "telep�lni tudjon."
 
-#: shell/e-shell-folder-creation-dialog.c:96
+#: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -6775,11 +7138,11 @@ msgstr ""
 "Nem tudom elk�sz�teni a megadott mapp�t:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:153
+#: shell/e-shell-folder-creation-dialog.c:156
 msgid "The specified folder name is not valid."
 msgstr "A megadott mappa n�v nem j�."
 
-#: shell/e-shell-folder-creation-dialog.c:245
+#: shell/e-shell-folder-creation-dialog.c:248
 msgid "Evolution - Create new folder"
 msgstr "Evol�ci� - �j mappa k�sz�t�se"
 
@@ -6791,28 +7154,28 @@ msgstr ""
 "A kiv�lasztott mappa t�pusa nem j� a megadott\n"
 "m�velethez."
 
-#: shell/e-shell-folder-selection-dialog.c:318
+#: shell/e-shell-folder-selection-dialog.c:319
 msgid "New..."
 msgstr "�j..."
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
 msgid "(Untitled)"
 msgstr "(N�vtelen)"
 
-#: shell/e-shell-view-menu.c:159
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nem tal�lhat� a $PATH-odban."
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:179
 msgid "Bug buddy could not be run."
 msgstr "A Bug buddy-t nem tudom futtatni."
 
-#: shell/e-shell-view-menu.c:194
+#: shell/e-shell-view-menu.c:208
 #, fuzzy
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:196
+#: shell/e-shell-view-menu.c:210
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6822,127 +7185,123 @@ msgstr ""
 "levelez�shez, napt�r �s c�mjegyz�k funkci�kkal\n"
 "a GNOME grafikus k�rnyezethez."
 
-#: shell/e-shell-view-menu.c:360
+#: shell/e-shell-view-menu.c:374
 msgid "Go to folder..."
 msgstr "Mapp�ba menj..."
 
-#: shell/e-shell-view.c:143
+#: shell/e-shell-view.c:148
 msgid "(No folder displayed)"
 msgstr "(Nincs mappa mutatva)"
 
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Mapp�k"
-
-#: shell/e-shell-view.c:1124
+#: shell/e-shell-view.c:1134
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evol�ci� - %s"
 
-#: shell/e-shell-view.c:1126
+#: shell/e-shell-view.c:1136
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evol�ci� - %s"
 
-#: shell/e-shell.c:372
+#: shell/e-shell.c:378
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nem tudom be�ll�tani a helyi t�rter�letet -- %s"
 
-#: shell/e-shell.c:1242
+#: shell/e-shell.c:1248
 #, 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:134
 #, fuzzy
 msgid "Create new shortcut group"
 msgstr "Egy �j n�vjegy k�sz�t�se"
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:137
 msgid "Group name:"
 msgstr "Csoport neve:"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:260
 #, 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:265
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:276
 msgid "_Small Icons"
 msgstr "_Kis ikonok"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:277
 msgid "Show the shortcuts as small icons"
 msgstr "Kis ikonok mutat�sa az elemeken"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:279
 msgid "_Large Icons"
 msgstr "_Nagy ikonok"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:280
 msgid "Show the shortcuts as large icons"
 msgstr "Nagy ikonok mutat�sa az elemeken"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:291
 msgid "_New Group..."
 msgstr "�_j csoport..."
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:292
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Egy �j n�vjegy k�sz�t�se"
 
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:294
 msgid "_Remove This Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:295
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Vedd le ezt az elemet az ind�t�s�vr�l"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:300
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Nagy ikonok mutat�sa az elemeken"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:301
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Nagy ikonok mutat�sa az elemeken"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate"
 msgstr "Aktiv�l"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate this shortcut"
 msgstr "Az elem aktiv�l�sa"
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:388
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Vedd le ezt az elemet az ind�t�s�vr�l"
 
-#: shell/e-shortcuts.c:375
+#: shell/e-shortcuts.c:379
 msgid "Error saving shortcuts."
 msgstr "Nem siker�l elmenteni az elemeket."
 
-#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: 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:42
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
 msgid "_View"
 msgstr "_N�zet"
 
-#: shell/e-storage-set-view.c:468
+#: shell/e-storage-set-view.c:649
 msgid "View the selected folder"
 msgstr "A kijel�lt mapp�k megtekint�se"
 
@@ -6950,47 +7309,47 @@ msgstr "A kijel�lt mapp�k megtekint�se"
 msgid "(No name)"
 msgstr "(n�vtelen)"
 
-#: shell/e-storage.c:429
+#: shell/e-storage.c:459
 msgid "No error"
 msgstr "Nincs hiba"
 
-#: shell/e-storage.c:431
+#: shell/e-storage.c:461
 msgid "Generic error"
 msgstr "Alapvet� hiba"
 
-#: shell/e-storage.c:433
+#: shell/e-storage.c:463
 msgid "A folder with the same name already exists"
 msgstr "A megadott n�ven m�r l�tezik mappa"
 
-#: shell/e-storage.c:435
+#: shell/e-storage.c:465
 msgid "The specified folder type is not valid"
 msgstr "A megadott mappat�pus nem j�"
 
-#: shell/e-storage.c:437
+#: shell/e-storage.c:467
 msgid "I/O error"
 msgstr "I/O hiba"
 
-#: shell/e-storage.c:439
+#: shell/e-storage.c:469
 msgid "Not enough space to create the folder"
 msgstr "Nincs el�g hely a mappa elk�sz�t�s�hez"
 
-#: shell/e-storage.c:441
+#: shell/e-storage.c:471
 msgid "The specified folder was not found"
 msgstr "A megadott mapp�t nem tal�lom"
 
-#: shell/e-storage.c:443
+#: shell/e-storage.c:473
 msgid "Function not implemented in this storage"
 msgstr "A funkci� nincs m�g ebben a t�rol�ban meg�rva"
 
-#: shell/e-storage.c:445
+#: shell/e-storage.c:475
 msgid "Permission denied"
 msgstr "Jogosults�gi hiba"
 
-#: shell/e-storage.c:447
+#: shell/e-storage.c:477
 msgid "Operation not supported"
 msgstr "A m�velet nem t�mogatott"
 
-#: shell/e-storage.c:449
+#: shell/e-storage.c:479
 msgid "The specified type is not supported in this storage"
 msgstr "A megadott t�pus nem t�mogatott ebben a t�rol�ban."
 
@@ -6999,7 +7358,7 @@ msgstr "A megadott t�pus nem t�mogatott ebben a t�rol�ban."
 msgid "The Evolution shell."
 msgstr "Nem tudom elind�tani az Evol�ci� shell-t."
 
-#: shell/main.c:73
+#: shell/main.c:83
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -7039,7 +7398,7 @@ msgstr ""
 "Az�rt 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:98
+#: shell/main.c:108
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7047,15 +7406,19 @@ msgstr ""
 "K�sz�nettel\n"
 "Az Evol�ci� Csapat\n"
 
-#: shell/main.c:129
+#: shell/main.c:139
 msgid "Cannot initialize the Evolution shell."
 msgstr "Nem tudom elind�tani az Evol�ci� shell-t."
 
-#: shell/main.c:175
-msgid "Disable."
-msgstr "Tilt�s."
+#: shell/main.c:185
+msgid "Disable splash screen"
+msgstr ""
+
+#: shell/main.c:186
+msgid "Send the debugging output of all components to a file."
+msgstr ""
 
-#: shell/main.c:195
+#: shell/main.c:219
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nem tudom elind�tani a Bonobo komponens rendszert."
 
@@ -7084,8 +7447,7 @@ msgstr "N�vjegy t�rl�se?"
 msgid "New contact"
 msgstr "A n�v tartalmaz"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
 #, fuzzy
 msgid "Previews the message to be printed"
 msgstr "T�maszerinti lev�l lista"
@@ -7095,7 +7457,7 @@ msgstr "T�maszerinti lev�l lista"
 msgid "Print contacts"
 msgstr "_N�vjegyek..."
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
 #, fuzzy
 msgid "Stop"
 msgstr "Pontsz�m"
@@ -7125,7 +7487,7 @@ msgstr "Forr�s hozz�ad�sa"
 msgid "_Contact"
 msgstr "_N�vjegyek..."
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
 #: ui/evolution-contact-editor.xml.h:15
 #, fuzzy
 msgid "_Print..."
@@ -7135,9 +7497,9 @@ msgstr "Nyomtat"
 msgid "_Search for contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
+#: 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"
 msgstr "_Eszk�z�k"
 
@@ -7153,141 +7515,180 @@ msgstr "Napt�r be�ll�t�sok"
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
+msgid "Create a new all day Event"
+msgstr "�j mappa k�sz�t�se"
+
+#: ui/evolution-calendar.xml.h:5
+#, fuzzy
 msgid "Create a new appointment"
 msgstr "A megbesz�l�s t�rl�se"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "�j mappa k�sz�t�se"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Day"
 msgstr "Napok"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Go To"
 msgstr "D�tumra ugr�s"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Go back in time"
 msgstr "K�vetkez� elemre ugr�s"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 #, fuzzy
 msgid "Go forward in time"
 msgstr "Tov�bb�t"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
+#, fuzzy
+msgid "Go to _Date"
+msgstr "D�tumra ugr�s"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Go to _Today"
+msgstr "Ugorj m�ra"
+
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
 msgid "Go to a specific date"
 msgstr "D�tumra ugr�s"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:14
 #, fuzzy
 msgid "Go to present time"
 msgstr "K�vetkez� elemre ugr�s"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:15
 #, fuzzy
 msgid "Month"
 msgstr "h�nap"
 
-#: ui/evolution-calendar.xml.h:13
-#, fuzzy
-msgid "New Appointment"
-msgstr "�j _id�pont"
+#: ui/evolution-calendar.xml.h:17
+msgid "New _Event"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
 #: ui/evolution-task-editor-dialog.xml.h:32
 #, fuzzy
 msgid "Next"
 msgstr "K�_vetkez�"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Open Calendar"
 msgstr "Napt�r megnyit�sa"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Prev"
 msgstr "El�n�zet:"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Previews the calendar to be printed"
+msgstr "T�maszerinti lev�l lista"
+
+#: ui/evolution-calendar.xml.h:25
 #, fuzzy
 msgid "Print calendar"
 msgstr "Napt�r nyomtat�sa"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Print this Calendar"
 msgstr "Napt�r nyomtat�sa"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
 #, fuzzy
 msgid "Save As"
 msgstr "Ment�s"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
 msgid "Save calendar as something else"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 #, fuzzy
 msgid "Show 1 day"
 msgstr "H�t sz�m�nak mutat�sa"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "Show 1 month"
 msgstr "H�t sz�m�nak mutat�sa"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
 msgid "Show 1 week"
 msgstr "H�t sz�m�nak mutat�sa"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 #, fuzzy
 msgid "Show the working week"
 msgstr "H�t sz�m�nak mutat�sa"
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
-#: widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
+#: widgets/misc/e-dateedit.c:422
 msgid "Today"
 msgstr "Ma"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "W_ork Week"
+msgstr "Munkah�t"
+
+#: ui/evolution-calendar.xml.h:36
 #, fuzzy
 msgid "Week"
 msgstr "h�t"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
 #, fuzzy
 msgid "_Appointment"
 msgstr "Megbesz�l�sek:"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
+#: ui/evolution-calendar.xml.h:38
+#, fuzzy
+msgid "_Day"
+msgstr "Napok"
+
+#: ui/evolution-calendar.xml.h:39
+#, fuzzy
+msgid "_Month"
+msgstr "h�nap"
+
+#: 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
 #, fuzzy
 msgid "_New"
 msgstr "_N�zet"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:41
 #, fuzzy
 msgid "_Open Calendar"
 msgstr "Napt�r megnyit�sa"
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
 #: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "_Save As..."
 msgstr "Ment mint..."
 
+#: ui/evolution-calendar.xml.h:45
+#, fuzzy
+msgid "_Week"
+msgstr "h�t"
+
 #: ui/evolution-contact-editor.xml.h:2
 #, fuzzy
 msgid "Delete this item"
@@ -7315,7 +7716,7 @@ msgid "Print this item"
 msgstr "Tennival� szerkeszt�se"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
 #, fuzzy
 msgid "Print..."
 msgstr "Nyomtat"
@@ -7352,7 +7753,7 @@ msgstr "FIXME: �ze_net ennek a szem�lynek"
 
 #: 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:29
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
 #, fuzzy
 msgid "_File"
 msgstr "_Mobil"
@@ -7417,7 +7818,7 @@ msgstr "A megbesz�l�s t�rl�se"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "Mapp�ba m�sol�s..."
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
 #: ui/evolution-task-editor-dialog.xml.h:14
 #, fuzzy
 msgid "Copy"
@@ -7520,7 +7921,7 @@ msgid "Print Setup"
 msgstr "Oldal be�ll�t�s:"
 
 #: 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
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Ment�s"
 
@@ -7543,7 +7944,8 @@ msgstr "V�lassz mapp�t"
 msgid "Schedule some sort of a meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:68
+#: ui/evolution-task-editor-dialog.xml.h:57
 #, fuzzy
 msgid "Select All"
 msgstr "V�lassz mapp�t"
@@ -7569,13 +7971,13 @@ msgid "_About..."
 msgstr "Bet�t�pus..."
 
 #: 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:26
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
 #, fuzzy
 msgid "_Close"
 msgstr "Bez�r"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "_Contact (FIXME)"
 msgstr "N�vjegy szerkeszt�"
@@ -7591,7 +7993,7 @@ msgid "_Debug"
 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:33
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Help"
 msgstr "_Otthoni"
@@ -7637,7 +8039,7 @@ msgstr "_Vezet�kn�v:"
 msgid "_Print"
 msgstr "Nyomtat"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
 #: ui/evolution-task-editor-dialog.xml.h:83
 #, fuzzy
 msgid "_Properties..."
@@ -7649,7 +8051,7 @@ msgid "_Select All"
 msgstr "V�lassz mapp�t"
 
 #: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:41
 #, fuzzy
 msgid "_Task (FIXME)"
 msgstr "N�vjegy szerkeszt�"
@@ -7683,277 +8085,419 @@ msgid "New Mail"
 msgstr "R�szletek"
 
 #: ui/evolution-mail.xml.h:2
+msgid "Apply any new filters to the mail in this box"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:3
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:4
 #, fuzzy
 msgid "Compose"
 msgstr "Bez�r"
 
-#: ui/evolution-mail.xml.h:3
+#: ui/evolution-mail.xml.h:5
 #, fuzzy
 msgid "Compose a new message"
 msgstr "Lev�l �r�sa"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Configure Folder..."
+msgstr "Mapp�ba mozgat�s..."
+
+#: ui/evolution-mail.xml.h:8
 #, fuzzy
 msgid "Copy message to a new folder"
 msgstr "Lev�l mozgat�sa m�s mapp�ba"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail.xml.h:9
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Lev�l mozgat�sa m�s mapp�ba"
+
+#: ui/evolution-mail.xml.h:10
 #, fuzzy
 msgid "Create _Virtual Folder From Message"
 msgstr "A lev�lb�l gy�rts szab�lyt"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Delete the selected messages"
+msgstr "A lev�l nyomtat�sa"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Display all of the message headers"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail.xml.h:15
+#, fuzzy
+msgid "Edit Message"
+msgstr "Lev�l _nyomtat�sa"
+
+#: ui/evolution-mail.xml.h:16
+#, fuzzy
+msgid "Edit the current message"
+msgstr "Jelenid�re ugr�s"
+
+#: ui/evolution-mail.xml.h:17
 #, fuzzy
-msgid "Empty Trash"
+msgid "Empty _Trash"
 msgstr "�res napok:"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Expunge"
+msgstr "_Tiszt�t"
+
+#: ui/evolution-mail.xml.h:19
 #, fuzzy
 msgid "Filter on Se_nder"
 msgstr "Sz�r� a felad�n"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:20
 #, fuzzy
 msgid "Filter on _Recipients"
 msgstr "Sz�r� a c�mzettekre"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:21
 #, fuzzy
 msgid "Filter on _Subject"
 msgstr "Sz�r� a t�m�ra"
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:22
+msgid "Finaly remove all mails tagged for deletion"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:23
 #, fuzzy
 msgid "Forget _Passwords"
 msgstr "Jelsz�"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:25
 #, fuzzy
 msgid "Forward As"
 msgstr "Tov�bb�t"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:27
+msgid "Forward the selected mail to someone"
+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.xml.h:30
 #, fuzzy
-msgid "Full Headers"
+msgid "Full _Headers"
 msgstr "Fejl�c"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:31
+#, fuzzy
+msgid "Hide Deleted Messages"
+msgstr "A lev�l nyomtat�sa"
+
+#: ui/evolution-mail.xml.h:32
 #, fuzzy
 msgid "Hide S_elected Messages"
 msgstr "A lev�l nyomtat�sa"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:33
 #, fuzzy
 msgid "Hide _Deleted Messages"
 msgstr "A lev�l nyomtat�sa"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:34
 #, fuzzy
 msgid "Hide _Read messages"
 msgstr "Forwarded message - %s"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Inline"
-msgstr ""
+#: ui/evolution-mail.xml.h:35
+#, fuzzy
+msgid "Invert Selection"
+msgstr "A kijel�lt mapp�k megtekint�se"
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:36
 #, fuzzy
 msgid "Manage _Subscriptions..."
 msgstr "Le�r�s:"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:37
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Jel�l�s olvasottnak"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:38
 #, fuzzy
 msgid "Mark All as R_ead"
 msgstr "Jel�l�s olvasottnak"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:39
+#, fuzzy
+msgid "Mark As Read"
+msgstr "Jel�l�s olvasottnak"
+
+#: ui/evolution-mail.xml.h:40
+#, fuzzy
+msgid "Mark As U_nread"
+msgstr "Jel�l�s nem olvasottnak"
+
+#: ui/evolution-mail.xml.h:41
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Jel�l�s nem olvasottnak"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:42
 #, fuzzy
-msgid "Message _Display"
-msgstr "Megjelen�t�s sz�nei"
+msgid "Mark the selected messages as having been read"
+msgstr "A lev�l nyomtat�sa"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:43
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:44
 #, fuzzy
 msgid "Move"
 msgstr "H"
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:45
 #, fuzzy
 msgid "Move message to a new folder"
 msgstr "Lev�l(levelek) mozgat�sa m�s mapp�ba"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:46
+#, fuzzy
+msgid "Move selected messages to another folder"
+msgstr "Lev�l(levelek) mozgat�sa m�s mapp�ba"
+
+#: ui/evolution-mail.xml.h:47
+msgid "Open in New Window"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Open the current message in a new window"
+msgstr "A levelet HTML form�tumban k�ldd"
+
+#: ui/evolution-mail.xml.h:53
+#, fuzzy
+msgid "Print Preview of message..."
+msgstr "Nyomtat�si el�n�zet"
+
+#: ui/evolution-mail.xml.h:54
 msgid "Print message to the printer"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:55
 #, fuzzy
-msgid "Quoted"
-msgstr "Semmi"
+msgid "Print message..."
+msgstr "Lev�l _nyomtat�sa"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:58
 msgid "Redirect (FIXME: implement me)"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:61
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Mindenkinek"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:62
+#, fuzzy
+msgid "Reply to all"
+msgstr "Mindenkinek"
+
+#: ui/evolution-mail.xml.h:64
+#, fuzzy
+msgid "Reply to sender"
+msgstr "Mindenkinek"
+
+#: ui/evolution-mail.xml.h:66
 #, fuzzy
 msgid "S_ource"
 msgstr "Forr�s"
 
-#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "Save the message into a new file"
+msgstr ""
+"Nem tudom elk�sz�teni a megadott mapp�t:\n"
+"%s"
+
+#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
 #, fuzzy
 msgid "Select _All"
 msgstr "V�lassz mapp�t"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:70
 #, fuzzy
 msgid "Select _Thread"
 msgstr "V�lassz mapp�t"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Send and Receive"
+#: ui/evolution-mail.xml.h:71
+#, fuzzy
+msgid "Send / Receive"
+msgstr "Sendmail"
+
+#: ui/evolution-mail.xml.h:72
+msgid "Send a reply to the person who sent you this mail"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:73
+msgid "Send a single mail in reply to all the selected mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:74
+msgid ""
+"Send queued mail\n"
+"    and retrieve new mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:76
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:77
 #, fuzzy
 msgid "Show _All"
 msgstr "Mutasd mind"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:79
 #, fuzzy
 msgid "Threaded Message list"
 msgstr "T�maszerinti lev�l lista"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:80
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "A lev�l nyomtat�sa"
+
+#: ui/evolution-mail.xml.h:82
 #, fuzzy
 msgid "VFolder on Se_nder"
 msgstr "VMappa a felad�ra"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:83
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "VMappa a c�mzettekre"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:84
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "VMappa a t�m�ra"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:85
 msgid "View Raw Message Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:86
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "Virtu�lis Mapp�k"
 
-#: ui/evolution-mail.xml.h:56
-#, fuzzy
-msgid "_Actions"
-msgstr "_M�veletek"
-
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:87
 #, fuzzy
 msgid "_Apply Filters"
 msgstr "Sz�r�k alkalmaz�sa"
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:88
 #, fuzzy
-msgid "_Compose"
-msgstr "Bez�r"
+msgid "_Attachment"
+msgstr "csatol�s"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:89
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "Mapp�ba m�sol�s..."
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:90
 #, fuzzy
 msgid "_Create Filter From Message"
 msgstr "A lev�lb�l gy�rts szab�lyt"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:92
 #, fuzzy
 msgid "_Expunge"
 msgstr "_Tiszt�t"
 
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:93
 #, fuzzy
 msgid "_Filters..."
 msgstr "Sz�r�k szerkeszt�se"
 
-#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
 #, fuzzy
 msgid "_Folder"
 msgstr "Mapp�k"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:95
 #, fuzzy
 msgid "_Forward"
 msgstr "Tov�bb�t"
 
-#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:96
+#, fuzzy
+msgid "_Inline"
+msgstr "_Beilleszt"
+
+#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
 #, fuzzy
 msgid "_Invert Selection"
 msgstr "A kijel�lt mapp�k megtekint�se"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:98
 #, fuzzy
 msgid "_Mail Message"
 msgstr "FIXME: _Lev�l"
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:99
 #, fuzzy
 msgid "_Mail Settings..."
 msgstr "Be�ll�t�sok tesztel�se"
 
-#: ui/evolution-mail.xml.h:69
-#, fuzzy
-msgid "_Message Hiding"
-msgstr "Lev�lt�rzs"
-
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail.xml.h:100
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "Mapp�ba mozgat�s..."
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail.xml.h:101
 #, fuzzy
 msgid "_Open Selected Items"
 msgstr "A feladat megnyit�sa"
 
-#: ui/evolution-mail.xml.h:74
-msgid "_Send and Receive"
-msgstr ""
+#: ui/evolution-mail.xml.h:103
+#, fuzzy
+msgid "_Quoted"
+msgstr "Semmi"
+
+#: ui/evolution-mail.xml.h:104
+#, fuzzy
+msgid "_Reply"
+msgstr "V�lasz"
+
+#: ui/evolution-mail.xml.h:105
+#, fuzzy
+msgid "_Resend Messages"
+msgstr "Lev�l _nyomtat�sa"
+
+#: ui/evolution-mail.xml.h:107
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Ment mint..."
+
+#: ui/evolution-mail.xml.h:108
+#, fuzzy
+msgid "_Send / Receive"
+msgstr "Sendmail"
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail.xml.h:109
 msgid "_Threaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:111
 #, fuzzy
 msgid "_Undelete"
 msgstr "Vissza�ll�t"
@@ -8233,7 +8777,7 @@ msgstr ""
 msgid "Undo the last action"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
 #, fuzzy
 msgid "_Appointment (FIXME)"
 msgstr "Megbesz�l�sek:"
@@ -8377,125 +8921,138 @@ msgstr "Mozgat�s alatt"
 msgid "_About Evolution..."
 msgstr "Evol�ci�"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "_Actions"
+msgstr "_M�veletek"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "Mapp�k"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "Mapp�ba menj..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Import file..."
 msgstr "�breszt� be�ll�t�sok"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:36
 #, fuzzy
 msgid "_Index"
 msgstr "_Beilleszt"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:37
 #, fuzzy
 msgid "_Mail message"
 msgstr "Lev�lt�rzs"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_New Folder"
 msgstr "�j VMappa"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Nagy ikonok mutat�sa az elemeken"
 
 #. 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:2475
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+msgid "Tentative"
+msgstr "K�s�rleti"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Foglalt"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "�zemen k�v�l"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Nincs inform�ci�"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
 msgid "_Invite Others..."
 msgstr "_M�sok megh�v�sa..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
 msgid "_Options"
 msgstr "_Be�ll�t�sok"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
 msgid "Show _Only Working Hours"
 msgstr "Csak a _munka�r�k mutat�sa"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
 msgid "Show _Zoomed Out"
 msgstr "_Nagy�tott mutat�sa"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
 msgid "_Update Free/Busy"
 msgstr "_Szabad/foglalt friss�t�se"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr "_Automatikus kiszed�s"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
 msgid "_All People and Resources"
 msgstr "_Minden ember �s er�forr�s"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
 msgid "All _People and One Resource"
 msgstr "Minden _ember �s egy er�forr�s"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
 msgid "_Required People"
 msgstr "_A k�rt emberek"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
 msgid "Required People and _One Resource"
 msgstr "A k�rt emberek �s egy e_r�forr�s"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
 msgid "Meeting _start time:"
 msgstr "Megbesz�l�s _kezd�dik:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
 msgid "Meeting _end time:"
 msgstr "Megbesz�l�s _v�ge:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
 msgid "All Attendees"
 msgstr "Minden megh�vott"
 
-#: widgets/menus/gal-view-menus.c:171
+#: widgets/menus/gal-view-menus.c:177
 #, fuzzy
 msgid "_Current View"
 msgstr "Jelenid�re ugr�s"
 
+#: widgets/menus/gal-view-menus.c:196
+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
@@ -8507,99 +9064,114 @@ msgstr "HKSCPsV"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
 msgid "Now"
 msgstr "Most"
 
-#: widgets/misc/e-cell-date-edit.c:239
+#: widgets/misc/e-cell-date-edit.c:242
 msgid "OK"
 msgstr ""
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#.
-#: widgets/misc/e-cell-date-edit.c:460
-#, fuzzy
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S%n"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
-#: 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"
-
-#. strftime format of a time in 12-hour format.
-#.
-#: widgets/misc/e-cell-date-edit.c:469
-#, fuzzy
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p%n"
-
-#. FIXME: Better message needed.
-#: widgets/misc/e-cell-date-edit.c:736
-msgid "The time is invalid"
+#: widgets/misc/e-cell-date-edit.c:723
+#, fuzzy, c-format
+msgid "The time must be in the format: %s"
 msgstr ""
+"A d�tumot a k�vetkez� form�ban tudod be�rni: \n"
+"\n"
+"%s"
 
 #: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:160
+#: widgets/misc/e-filter-bar.c:166
 #, fuzzy
 msgid "Save Search"
 msgstr "Keres�s"
 
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:237
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Halad�..."
 
-#: widgets/misc/e-filter-bar.c:311
+#: widgets/misc/e-filter-bar.c:317
 #, fuzzy
 msgid "Advanced ..."
 msgstr "Halad�..."
 
-#: widgets/misc/e-messagebox.c:141
+#: widgets/misc/e-messagebox.c:152
 #, fuzzy
 msgid "Information"
 msgstr "Nincs inform�ci�"
 
-#: widgets/misc/e-messagebox.c:148
+#: widgets/misc/e-messagebox.c:159
 #, fuzzy
 msgid "Warning"
 msgstr "Mozgat�s alatt"
 
-#: widgets/misc/e-messagebox.c:162
+#: widgets/misc/e-messagebox.c:173
 #, fuzzy
 msgid "Question"
 msgstr "Le�r�s:"
 
-#: widgets/misc/e-messagebox.c:169
+#: widgets/misc/e-messagebox.c:180
 #, fuzzy
 msgid "Message"
 msgstr "Lev�lt�rzs"
 
 #. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
+#: widgets/misc/e-messagebox.c:224
 #, fuzzy
 msgid "Don't show this message again."
 msgstr "A lev�l t�rl�se"
 
-#: widgets/misc/e-search-bar.c:140
+#: widgets/misc/e-search-bar.c:148
 #, fuzzy
 msgid "Sear_ch"
 msgstr "Keres�s"
 
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Adress Cards"
+msgstr "C�m"
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "V�llalat"
+
+#: views/addressbook/galview.xml.h:3
+#, fuzzy
+msgid "Phone List"
+msgstr "Telefon t�pusok"
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "Felad�"
+
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "_St�tusz:"
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "T�ma"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "Lev�lt�rzs"
+
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With Category"
+msgstr ""
+"\n"
+"Kateg�ri�k:"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
 msgid "The Personal Addressbook Server"
@@ -8609,22 +9181,147 @@ msgstr "Forr�s hozz�ad�sa"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:153
+#: wombat/wombat.c:173
 #, fuzzy
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "Nem tudom a bonobo-t elind�tani"
 
-#: wombat/wombat.c:165
+#: wombat/wombat.c:185
 #, fuzzy
 msgid "init_corba(): could not initialize GNOME"
 msgstr "Nem tudom a bonobo-t elind�tani"
 
-#: wombat/wombat.c:178
+#: wombat/wombat.c:198
 #, fuzzy
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "A Bonobo inicializ�l�sa nem siker�lt"
 
 #, fuzzy
+#~ msgid "Click here to add a contact"
+#~ msgstr "<kattints ide a d�tum kiv�laszt�s�hoz>"
+
+#, fuzzy
+#~ msgid "Secure IMAPv4"
+#~ msgstr "IMAPv4"
+
+#, fuzzy
+#~ msgid "No authentication required"
+#~ msgstr "Authentik�ci�:"
+
+#~ msgid "Source"
+#~ msgstr "Forr�s"
+
+#, fuzzy
+#~ msgid "Advanced"
+#~ msgstr "Halad�..."
+
+#, fuzzy
+#~ msgid "Check settings"
+#~ msgstr "Be�ll�t�sok tesztel�se"
+
+#~ msgid "Email address:"
+#~ msgstr "Email c�m:"
+
+#, fuzzy
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Levelez�s be�ll�t�sa"
+
+#, fuzzy
+#~ msgid "Hostname:"
+#~ msgstr "Felhaszn�l�ln�v:"
+
+#, fuzzy
+#~ msgid "IMAP"
+#~ msgstr "IMAPv4"
+
+#, fuzzy
+#~ msgid "Keep mail on server"
+#~ msgstr "Kil�p�s a lev�lszerkeszt�b�l"
+
+#, fuzzy
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos 4"
+
+#, fuzzy
+#~ msgid "Mail"
+#~ msgstr "_Lev�l"
+
+#, fuzzy
+#~ msgid "Mail Account"
+#~ msgstr "Email tartalmaz"
+
+#, fuzzy
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Levelez�s be�ll�t�sa"
+
+#, fuzzy
+#~ msgid "Optional"
+#~ msgstr "Be�ll�t�sok"
+
+#, fuzzy
+#~ msgid "Password:"
+#~ msgstr "Jelsz�"
+
+#, fuzzy
+#~ msgid "Remember my password"
+#~ msgstr "VCard-k�nt ment�s"
+
+#, fuzzy
+#~ msgid "Reply address:"
+#~ msgstr "Email c�m:"
+
+#, fuzzy
+#~ msgid "Required"
+#~ msgstr "_A k�rt emberek"
+
+#, fuzzy
+#~ msgid "Save password"
+#~ msgstr "VCard-k�nt ment�s"
+
+#, fuzzy
+#~ msgid "Select signature file"
+#~ msgstr "Al��r�s f�jl:"
+
+#, fuzzy
+#~ msgid "Server type:"
+#~ msgstr "Szerver:"
+
+#, fuzzy
+#~ msgid "Signature:"
+#~ msgstr "Al��r�s f�jl:"
+
+#, fuzzy
+#~ msgid "Transport"
+#~ msgstr "�ttetsz�"
+
+#, fuzzy
+#~ msgid "Transport Authentication"
+#~ msgstr "Authentik�ci�:"
+
+#, fuzzy
+#~ msgid "minutes."
+#~ msgstr "percek"
+
+#, fuzzy
+#~ msgid "<unknown>"
+#~ msgstr "Ismeretlen"
+
+#~ msgid "No GPG/PGP program available."
+#~ msgstr "Nincs el�rhet� GPG/PGP program."
+
+#, fuzzy
+#~ msgid "Message _Display"
+#~ msgstr "Megjelen�t�s sz�nei"
+
+#, fuzzy
+#~ msgid "_Compose"
+#~ msgstr "Bez�r"
+
+#, fuzzy
+#~ msgid "_Message Hiding"
+#~ msgstr "Lev�lt�rzs"
+
+#, fuzzy
 #~ msgid "Copyright (C) 2000, Helix Code, Inc."
 #~ msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
@@ -8633,10 +9330,6 @@ msgstr "A Bonobo inicializ�l�sa nem siker�lt"
 #~ msgstr "UNIX mbox form�tum� f�jlok"
 
 #, fuzzy
-#~ msgid "Connect to server"
-#~ msgstr "Nem tudom elind�tani a wombat kiszolg�l�t"
-
-#, fuzzy
 #~ msgid "New"
 #~ msgstr "�j..."
 
@@ -8793,12 +9486,6 @@ msgstr "A Bonobo inicializ�l�sa nem siker�lt"
 #~ msgstr "Nincs kimen� mapp�d be�ll�tva"
 
 #, fuzzy
-#~ msgid ""
-#~ "Unable to register folder '%s':\n"
-#~ "%s"
-#~ msgstr "Nem tudom a dial�gust elk�sz�teni."
-
-#, fuzzy
 #~ msgid "Fetching email from %s"
 #~ msgstr "Levelek let�lt�se"
 
@@ -9078,13 +9765,6 @@ msgstr "A Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Server:"
 #~ msgstr "Szerver:"
 
-#~ msgid "Detect supported types..."
-#~ msgstr "T�mogatott t�pusok detekt�l�sa..."
-
-#, fuzzy
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Kil�p�s a lev�lszerkeszt�b�l"
-
 #~ msgid "Mail source type:"
 #~ msgstr "Lev�l forr�s t�pusa:"
 
@@ -9115,9 +9795,6 @@ msgstr "A Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Edit News Server"
 #~ msgstr "H�rcsoport-szerverek"
 
-#~ msgid "Testing \"%s\""
-#~ msgstr "'%s' tesztel�se"
-
 #~ msgid "Identities"
 #~ msgstr "Azonos�t�k"
 
@@ -9184,18 +9861,6 @@ msgstr "A Bonobo inicializ�l�sa nem siker�lt"
 #~ msgstr "Sz�r� a c�mzettekre"
 
 #, fuzzy
-#~ msgid "Mar_k As Read"
-#~ msgstr "Jel�l�s olvasottnak"
-
-#, fuzzy
-#~ msgid "Mark As U_nread"
-#~ msgstr "Jel�l�s nem olvasottnak"
-
-#, fuzzy
-#~ msgid "Print Preview of message..."
-#~ msgstr "Nyomtat�si el�n�zet"
-
-#, fuzzy
 #~ msgid "Reply to _Sender"
 #~ msgstr "Mindenkinek"
 
@@ -9204,10 +9869,6 @@ msgstr "A Bonobo inicializ�l�sa nem siker�lt"
 #~ msgstr "Mutasd mind"
 
 #, fuzzy
-#~ msgid "_Edit Message"
-#~ msgstr "Lev�l _nyomtat�sa"
-
-#, fuzzy
 #~ msgid "_Filter on Subject"
 #~ msgstr "Sz�r� a t�m�ra"
 
@@ -9220,10 +9881,6 @@ msgstr "A Bonobo inicializ�l�sa nem siker�lt"
 #~ msgstr "Lev�l _nyomtat�sa"
 
 #, fuzzy
-#~ msgid "_Save Message As..."
-#~ msgstr "Ment mint..."
-
-#, fuzzy
 #~ msgid "_Source"
 #~ msgstr "Forr�s"
 
@@ -9231,9 +9888,6 @@ msgstr "A Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "_VFolder on Subject"
 #~ msgstr "VMappa a t�m�ra"
 
-#~ msgid "Available Categories:"
-#~ msgstr "Megl�v� mez�k"
-
 #~ msgid "External Directories"
 #~ msgstr "K�ls� k�nyvt�rak"
 
@@ -9383,10 +10037,6 @@ msgstr "A Bonobo inicializ�l�sa nem siker�lt"
 #~ msgstr "_Tiszt�t"
 
 #, fuzzy
-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "Lev�l mozgat�sa m�s mapp�ba"
-
-#, fuzzy
 #~ msgid "Mark messages in folder \"%s\""
 #~ msgstr "Lev�l mozgat�sa m�s mapp�ba"
 
@@ -9481,9 +10131,6 @@ msgstr "A Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Highlight not yet due items"
 #~ msgstr "Vil�g�sd ki a m�g nem lej�rt elemeket"
 
-#~ msgid "Highlight items due today"
-#~ msgstr "A ma lej�r� elemek kivil�g�t�sa"
-
 #~ msgid "To Do List"
 #~ msgstr "Tennival� lista"
 
@@ -9501,10 +10148,6 @@ msgstr "A Bonobo inicializ�l�sa nem siker�lt"
 #~ msgstr "Nem tudom a dial�gust elk�sz�teni."
 
 #, fuzzy
-#~ msgid "Cannot get message: %s"
-#~ msgstr "Nem tudom be�ll�tani a helyi t�rter�letet -- %s"
-
-#, fuzzy
 #~ msgid "Cannot copy data to output file: %s"
 #~ msgstr ""
 #~ "Nem tudom m�solni a f�jlokat\n"